Modify the prepare script to be more usable

README.md

@@ -19,13 +19,11 @@ or
 Installation
 ============
 
-Fetch yourself an PBF file of OSM data an run "preprocess" which will create 2 
-Docker volumes named 
+Fetch yourself an PBF file of OSM data an run "prepare" 
 
-	local     routecompare_osrmAdata
-	local     routecompare_osrmBdata
+	./preprocess guetersloh-latest.osm.pbf osrmAprofiles/car.lua osrmBprofiles/car.lua
 
-with the corresponding OSRM files in it.
+which will create 2 Docker volumes containing the different data.
 
 Then run
 

prepare

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+PBF=$1
+PROFILEA=$2
+PROFILEB=$3
+
+preparesingle() {
+	PBF=$1
+	PROFILE=$2
+	VOLUMENAME=$3
+
+	PROFILEDIR=$(dirname ${PROFILE})
+	PROFILENAME=$(basename ${PROFILE})
+
+	docker run -t \
+		-v "${VOLUMENAME}:/data" \
+		-v "${PWD}/${PBF}:/data/latest.pbf" \
+		-v "${PWD}/${PROFILEDIR}:/profile" \
+		osrm/osrm-backend \
+			osrm-extract \
+				-p /profile/${PROFILENAME} \
+				/data/latest.pbf
+
+	docker run -t \
+		-v "${VOLUMENAME}:/data" \
+		osrm/osrm-backend \
+			osrm-partition /data/latest.osrm
+
+	docker run -t \
+		-v "${VOLUMENAME}:/data" \
+		osrm/osrm-backend \
+			osrm-customize /data/latest.osrm
+}
+
+docker volume rm routecompare_osrmAdata
+docker volume rm routecompare_osrmBdata
+
+preparesingle ${PBF} ${PROFILEA} routecompare_osrmAdata
+preparesingle ${PBF} ${PROFILEB} routecompare_osrmBdata

preprocess

@@ -1,50 +0,0 @@
-
-PBF=guetersloh-latest.osm.pbf
-VOLUMENAME=routecompare_osrmAdata
-TARGETNAME=latest
-PROFILEDIR=osrmAprofiles
-PROFILE=car.lua
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	-v "${PWD}/${PBF}:/data/${TARGETNAME}.pbf" \
-	-v "${PWD}/${PROFILEDIR}:/profile" \
-	osrm/osrm-backend \
-		osrm-extract \
-			-p /profile/${PROFILE} \
-			/data/${TARGETNAME}.pbf
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	osrm/osrm-backend \
-		osrm-partition /data/${TARGETNAME}.osrm
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	osrm/osrm-backend \
-		osrm-customize /data/${TARGETNAME}.osrm
-
-VOLUMENAME=routecompare_osrmBdata
-TARGETNAME=latest
-PROFILEDIR=osrmBprofiles
-PROFILE=car.lua
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	-v "${PWD}/${PBF}:/data/${TARGETNAME}.pbf" \
-	-v "${PWD}/${PROFILEDIR}:/profile" \
-	osrm/osrm-backend \
-		osrm-extract \
-			-p /profile/${PROFILE} \
-			/data/${TARGETNAME}.pbf
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	osrm/osrm-backend \
-		osrm-partition /data/${TARGETNAME}.osrm
-
-docker run -t \
-	-v "${VOLUMENAME}:/data" \
-	osrm/osrm-backend \
-		osrm-customize /data/${TARGETNAME}.osrm
-