update doc and reshape get-shapefiles path fix as in new script versi…

…on (PR pending)

DOCKER.md

@@ -14,7 +14,7 @@ Docker itself. Otherwise you need to [install Docker Compose manually](https://d
 ## Importing data
 
 openstreetmap-carto needs a database populated with rendering data to work. You first need a data file to import.
-It's probably easiest to grab an PBF of OSM data from [Mapzen](https://mapzen.com/metro-extracts/) or [geofabrik](http://download.geofabrik.de/).
+It's probably easiest to grab an PBF of OSM data from [Mapzen](https://mapzen.com/data/metro-extracts/) or [Geofabrik](http://download.geofabrik.de/).
 Once you have that file put it into the openstreetmap-carto directory and run `docker-compose up import` in the openstreetmap-carto directory.
 This downloads (if not present) and starts the PostgreSQL container and builds (if not present) and starts a container that runs
 [osm2pgsql](https://github.com/openstreetmap/osm2pgsql) to import the data.

scripts/get-shapefiles.py

@@ -259,9 +259,7 @@ def main():
    (indexing shapes is suggested for performance improvement).\n""")
 
     if args.option_force:
-        path = os.path.dirname(__file__)
-        if len(path) > 0:
-            os.chdir(path)
+        os.chdir(os.path.join(os.path.dirname(__file__)))
     else:
         os.chdir(os.path.join(os.path.dirname(__file__), '..'))
         if not os.path.isfile("project.mml"):