Merge pull request #132 from seemethere/fix_enbsubst

seemethere · web-flow · commit 6bf300318eba · 2019-07-15T10:29:49.000-10:00
[TAR-917] ci: Update addprefix to add another `$`
diff --git a/Makefile b/Makefile
@@ -6,13 +6,14 @@ VOLUME_MOUNTS=-v "$(CURDIR)":/v
 SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117)
 SHELLCHECK=docker run --rm $(VOLUME_MOUNTS) -w /v koalaman/shellcheck $(SHELLCHECK_EXCLUSIONS)
 
-ENVSUBST_VARS=SCRIPT_COMMIT_SHA
+ENVSUBST_VARS=LOAD_SCRIPT_COMMIT_SHA
 
 .PHONY: build
+build: build/install.sh
 
 build/install.sh: install.sh
 	mkdir -p $(@D)
-	SCRIPT_COMMIT_SHA='"$(shell git rev-parse HEAD)"' envsubst '$(addprefix $,$(ENVSUBST_VARS))' < $< > $@
+	LOAD_SCRIPT_COMMIT_SHA='$(shell git rev-parse HEAD)' envsubst '$(addprefix $$,$(ENVSUBST_VARS))' < $< > $@
 
 .PHONY: shellcheck
 shellcheck: build/install.sh
diff --git a/install.sh b/install.sh
@@ -16,7 +16,7 @@ set -e
 #
 # Git commit from https://github.com/docker/docker-install when
 # the script was uploaded (Should only be modified by upload job):
-SCRIPT_COMMIT_SHA=${SCRIPT_COMMIT_SHA}
+SCRIPT_COMMIT_SHA="${LOAD_SCRIPT_COMMIT_SHA}"
 
 
 # The channel to install from:

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ set -e`
`16`	`16`	`#`
`17`	`17`	`# Git commit from https://github.com/docker/docker-install when`
`18`	`18`	`# the script was uploaded (Should only be modified by upload job):`
`19`		`-SCRIPT_COMMIT_SHA=${SCRIPT_COMMIT_SHA}`
	`19`	`+SCRIPT_COMMIT_SHA="${LOAD_SCRIPT_COMMIT_SHA}"`
`20`	`20`
`21`	`21`
`22`	`22`	`# The channel to install from:`