similar find and replace with $CURDIR in makefiles

with some manual fixes in cases where there was more path stuff after the variable

Author: MoralCode

DataLayerService/Makefile

@@ -32,7 +32,7 @@ src/main/java/org/microfunctions/data_layer/DataLayerService.java: \
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	docker run --rm -i --name datalayer-thrift \
 		--user $(UID):$(GID) \
-		-v $(CURDIR):/usr/src/datalayer -w /usr/src/datalayer \
+		-v "$(CURDIR)":/usr/src/datalayer -w /usr/src/datalayer \
 		$(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) \
 		bash -c 'thrift --gen java -out ./src/main/java/ ./thrift/DataLayerMessage.thrift; thrift --gen java -out ./src/main/java/ ./thrift/DataLayerService.thrift'
 	touch src/main/java/org/microfunctions/data_layer/DataLayerService.java
@@ -45,7 +45,7 @@ PythonClient/data_layer: \
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	docker run --rm -i --name datalayer-thrift \
 		--user $(UID):$(GID) \
-		-v $(CURDIR):/usr/src/datalayer -w /usr/src/datalayer \
+		-v "$(CURDIR)":/usr/src/datalayer -w /usr/src/datalayer \
 		$(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) \
 		bash -c 'thrift --gen py -out ./PythonClient ./thrift/DataLayerMessage.thrift; thrift --gen py -out ./PythonClient ./thrift/DataLayerService.thrift'
 
@@ -75,7 +75,7 @@ target/datalayerservice.jar: $(JAVA_SOURCES) \
 	if [ ! -e .m2/repository ]; then mkdir -p .m2/repository; fi
 	docker run --rm -i --name datalayer-maven \
 		--user $(UID):$(GID) \
-		-e HOME=/usr/src/datalayer -v $(CURDIR):/usr/src/datalayer -w /usr/src/datalayer \
+		-e HOME=/usr/src/datalayer -v "$(CURDIR)":/usr/src/datalayer -w /usr/src/datalayer \
 		maven:3.6.1-jdk-8 \
 		mvn -Drevision=$(GIT_REVISION) -Dlibthrift.version=$(MVN_LIBTHRIFT_VERSION) -DargLine="-Duser.home=/tmp" -s /usr/src/datalayer/.m2/settings-docker.xml package
 

FunctionWorker/Makefile

@@ -27,14 +27,14 @@ $(PYTHON_DATALAYER): ../build_env.mk \
 		../DataLayerService/thrift/DataLayerService.thrift \
 		../build_tools/thrift/$(THRIFT_VERSION)/build_thrift.sh
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
-	docker run --user $(UID):$(GID) --rm -v $(CURDIR)/..:/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\
+	docker run --user $(UID):$(GID) --rm -v "$(CURDIR)/..":/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\
 		thrift --gen py -out FunctionWorker/python/ DataLayerService/thrift/DataLayerMessage.thrift; \
 		thrift --gen py -out FunctionWorker/python/ DataLayerService/thrift/DataLayerService.thrift'
 
 doc/MicroFunctionsAPI.html: $(PYTHON_DATALAYER)
 	docker run --user $(UID):$(GID) --rm -i \
 		--name mfnapi_doc_gen \
-		-v $(CURDIR):/opt/mfnapi \
+		-v "$(CURDIR)":/opt/mfnapi \
 		-w /opt/mfnapi \
 		-e http_proxy \
 		-e https_proxy \

JavaRequestHandler/Makefile

@@ -29,7 +29,7 @@ CLASSFILES=$(shell find target/classes/org/microfunctions/mfnapi/ -type f)
 mfnapi.jar: $(CLASSFILES)
 	docker run --rm --name mfnapijava \
 	--user $(UID):$(GID) \
-	-v $(CURDIR):/usr/src/mfnapijava -w /usr/src/mfnapijava \
+	-v "$(CURDIR)":/usr/src/mfnapijava -w /usr/src/mfnapijava \
 	openjdk:8-jdk-stretch \
 	bash -c 'cd target/classes; jar -cvf mfnapi.jar org/microfunctions/mfnapi/*.class; mv mfnapi.jar ../../'
 
@@ -41,7 +41,7 @@ src/main/java/org/microfunctions/mfnapi/MicroFunctionsAPIService.java: \
 	cp ../FunctionWorker/MicroFunctionsAPI.thrift .
 	docker run --rm -i --name mfnapi-thrift \
 		--user $(UID):$(GID) \
-		-v $(CURDIR):/usr/src/mfnapi -w /usr/src/mfnapi \
+		-v "$(CURDIR)":/usr/src/mfnapi -w /usr/src/mfnapi \
 		$(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) \
 		bash -c 'thrift --gen java -out ./src/main/java/ ./MicroFunctionsAPI.thrift'
 	rm ./MicroFunctionsAPI.thrift
@@ -72,7 +72,7 @@ target/javaworker.jar: $(JAVA_SOURCES) \
 	if [ ! -e .m2/repository ]; then mkdir -p .m2/repository; fi
 	docker run --rm -i --name javaworker \
 		--user $(UID):$(GID) \
-		-e HOME=/usr/src/javaworker -v $(CURDIR):/usr/src/javaworker -w /usr/src/javaworker \
+		-e HOME=/usr/src/javaworker -v "$(CURDIR)":/usr/src/javaworker -w /usr/src/javaworker \
 		maven:3.6.1-jdk-8 \
 		mvn -Drevision=$(GIT_REVISION) -Dlibthrift.version=$(MVN_LIBTHRIFT_VERSION) -DargLine="-Duser.home=/tmp" -s /usr/src/javaworker/.m2/settings-docker.xml -e package; 
 
@@ -83,7 +83,7 @@ target/site/apidocs/index.html: $(JAVA_SOURCES) \
 		.m2/settings-docker.xml
 	docker run --rm -i --name javaworker \
 		--user $(UID):$(GID) \
-		-e HOME=/usr/src/javaworker -v $(CURDIR):/usr/src/javaworker -w /usr/src/javaworker \
+		-e HOME=/usr/src/javaworker -v "$(CURDIR)":/usr/src/javaworker -w /usr/src/javaworker \
 		maven:3.6.1-jdk-8 \
 		mvn -Drevision=$(GIT_REVISION) -Dlibthrift.version=$(MVN_LIBTHRIFT_VERSION) -DargLine="-Duser.home=/tmp" -s /usr/src/javaworker/.m2/settings-docker.xml -e javadoc:javadoc;
 

ManagementService/Makefile

@@ -38,7 +38,7 @@ $(THRIFT): ../DataLayerService/thrift/DataLayerMessage.thrift \
 		../build_tools/thrift/$(THRIFT_VERSION)/build_thrift.sh
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	mkdir -p data_layer
-	docker run --user $(UID):$(GID) --rm -v $(CURDIR)/..:/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\
+	docker run --user $(UID):$(GID) --rm -v "$(CURDIR)/..":/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\
 		thrift --gen py -out ManagementService/ DataLayerService/thrift/DataLayerMessage.thrift; \
 		thrift --gen py -out ManagementService/ DataLayerService/thrift/DataLayerService.thrift'
 

Sandbox/frontend/Makefile

@@ -30,17 +30,17 @@ datalayermessage: ../../DataLayerService/thrift/DataLayerMessage.thrift ../../bu
 	cd ../../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	docker run --rm -i --name sandbox-thrift \
 		--user $(UID):$(GID) \
-		-v $(CURDIR)/../../DataLayerService:/usr/src/datalayer \
-		-v $(CURDIR):/usr/src/sandbox -w /usr/src/sandbox \
+		-v "$(CURDIR)/../../DataLayerService":/usr/src/datalayer \
+		-v "$(CURDIR)":/usr/src/sandbox -w /usr/src/sandbox \
 		$(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) \
 		bash -c 'thrift --gen go:package_prefix=github.com/knix-microfunctions/knix/Sandbox/frontend/ -out ./ /usr/src/datalayer/thrift/DataLayerMessage.thrift'
 
 datalayerservice: ../../DataLayerService/thrift/DataLayerService.thrift ../../build_env.mk ../../build_tools/thrift/$(THRIFT_VERSION)/build_thrift.sh
 	cd ../../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	docker run --rm -i --name sandbox-thrift \
 		--user $(UID):$(GID) \
-		-v $(CURDIR)/../../DataLayerService:/usr/src/datalayer \
-		-v $(CURDIR):/usr/src/sandbox -w /usr/src/sandbox \
+		-v "$(CURDIR)/../../DataLayerService":/usr/src/datalayer \
+		-v "$(CURDIR)":/usr/src/sandbox -w /usr/src/sandbox \
 		$(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) \
 		bash -c 'thrift --gen go:package_prefix=github.com/knix-microfunctions/knix/Sandbox/frontend/ -out ./ /usr/src/datalayer/thrift/DataLayerService.thrift'
 
@@ -50,7 +50,7 @@ mfnmessage.go: ../schema/mfnmessage-schema.json
 		--env http_proxy=$(HTTP_PROXY) \
 		--env https_proxy=$(HTTPS_PROXY) \
 		--env XDG_CACHE_HOME=/tmp/.cache \
-		-v $(CURDIR)/../:/usr/src/sandbox \
+		-v "$(CURDIR)/../":/usr/src/sandbox \
 		-w /usr/src/sandbox/frontend \
 		golang:1.13 \
 		bash -c 'go get github.com/a-h/generate/...; schema-generate $^ > $@'
@@ -60,7 +60,7 @@ mfnmessage.go: ../schema/mfnmessage-schema.json
 #		--user $(UID):$(GID) \
 #		--env http_proxy=$(HTTP_PROXY) \
 #		--env https_proxy=$(HTTPS_PROXY) \
-#		-v $(CURDIR)/../:/usr/src/sandbox \
+#		-v "$(CURDIR)/../":/usr/src/sandbox \
 #		-w /usr/src/sandbox/frontend \
 #		golang:1.13 \
 #		bash -c 'go get github.com/a-h/generate/...; schema-generate $^ > $@'
@@ -72,7 +72,7 @@ frontend: mfnmessage.go promstats.go datalayermessage datalayerservice $(SOURCES
 		--env http_proxy=$(HTTP_PROXY) \
 		--env https_proxy=$(HTTPS_PROXY) \
 		--env XDG_CACHE_HOME=/tmp/.cache \
-		-v $(CURDIR):/app \
+		-v "$(CURDIR)":/app \
 		-w /app \
 		golang:1.14 \
 		bash -c 'go mod download; CGO_ENABLED=0 GOOS=linux go build -v -o $@'

TriggersFrontend/Makefile

@@ -25,7 +25,7 @@ RUST_SOURCES=$(shell find src/ -type f)
 target/release/TriggersFrontend: $(RUST_SOURCES) Cargo.toml ../build_env.mk
 	docker run --rm --name build_triggers_frontend \
 		--user $(UID):$(GID) \
-		-v $(CURDIR):/code -w /code \
+		-v "$(CURDIR)":/code -w /code \
 		-e http_proxy \
 		-e https_proxy \
 		$(RUST_IMAGE_NAME):$(RUST_VERSION) bash -c 'cargo build --release'

redis/Makefile

@@ -24,7 +24,7 @@ redis-server: Dockerfile_redis_build Makefile
 	echo "Building redis server"
 	mkdir -p redis-server
 	$(call build_image,Dockerfile_redis_build,redis_local_queue)
-	docker run -i --rm -u $$(id -u):$$(id -g) -v $(CURDIR):/temp -w /temp --ulimit nofile=262144:262144 redis_local_queue:$(VERSION) cp /build/redis/src/redis-server redis-server/.
+	docker run -i --rm -u $$(id -u):$$(id -g) -v "$(CURDIR)":/temp -w /temp --ulimit nofile=262144:262144 redis_local_queue:$(VERSION) cp /build/redis/src/redis-server redis-server/.
 	echo "appendonly no" > redis-server/redis_sock.conf
 	echo "save \"\"" >> redis-server/redis_sock.conf
 	echo "port 0" >> redis-server/redis_sock.conf