Homogenize symlinked maps_build and osm-maps path

Signed-off-by: zyphlar <zyphlar@gmail.com>

tools/python/maps_generator/var/etc/map_generator.ini.prod

@@ -11,7 +11,7 @@ BUILD_PATH: /root/OM/omim-build-relwithdebinfo
 DEBUG: 0
 # A main working directory. There is a subdirectory created for each generator run
 # which contains the planet and other downloads, temporary build files, logs and completed MWMs.
-MAIN_OUT_PATH: ${Developer:OMIM_PATH}/../maps_build
+MAIN_OUT_PATH: /root/OM/osm-maps
 # Path for storing caches for nodes, ways, relations.
 # If it's not set then caches are stored inside the directory of the current build.
 # CACHE_PATH: ${Main:MAIN_OUT_PATH}/cache

tools/unix/Dockerfile

@@ -48,7 +48,7 @@ RUN mkdir /root/OM
 # When running, bind mount the repo here
 RUN mkdir /root/OM/comaps-init
 # And a volume to store the large output/temp files here
-RUN mkdir /root/OM/maps_build
+RUN mkdir /root/OM/osm-maps
 # And the output of the app build
 RUN mkdir /root/OM/omim-build-release
 RUN mkdir /root/OM/omim-build-relwithdebinfo

tools/unix/docker_maps_generator.sh

@@ -30,7 +30,7 @@ echo "<$(date +%T)> Starting..."
 #   /root/OM/comaps-init
 #   /root/OM/omim-build-release
 #   /root/OM/omim-build-relwithdebinfo
-#   /root/OM/maps_build
+#   /root/OM/osm-maps
 #   /home/planet
 #
 mkdir -p /root/.config/CoMaps # Odd mkdir permission errors in generator_tool in Docker without these
@@ -153,12 +153,12 @@ cd /root/OM/comaps-init/tools/python
   # rclone --progress copy ~/OM/maps_build/$buildfolder/$builddate r2:$S3_BUCKET/maps/$builddate/
 
 else
-  echo "<$(date +%T)> No MWM files in ~/OM/maps_build/$buildfolder/$builddate/*.mwm, not uploading maps."
-  echo "<$(date +%T)> Found: $(ls -alt ~/OM/maps_build/*)"
+  echo "<$(date +%T)> No MWM files in ~/OM/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps."
+  echo "<$(date +%T)> Found: $(ls -alt ~/OM/osm-maps/*)"
 fi
 
 echo "<$(date +%T)> Temporarily NOT Removing intermediate data..."
-#rm -rf ~/OM/maps_build/*/intermediate_data
+#rm -rf ~/OM/osm-maps/*/intermediate_data
 
 echo "<$(date +%T)> DONE"
 

tools/unix/run-docker.sh

@@ -60,6 +60,6 @@ docker run \
   --ulimit nofile=262144:262144 \
   -v /media/4tbexternal/comaps-init:/root/OM/comaps-init \
   -v /media/4tbexternal/osm-planet:/home/planet \
-  -v /media/4tbexternal/osm-maps:/root/OM/maps_build \
+  -v /media/4tbexternal/osm-maps:/root/OM/osm-maps \
   -it maps_generator \
   /root/OM/organicmaps/tools/unix/docker_maps_generator.sh