ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #603 from josephholsten/support-paths-with-spaces 

quote $DIR & $(CURDIR) to support $GOPATH with spaces
This commit is contained in:
Armon Dadgar 2014-12-03 12:09:23 -08:00
parent 7182e5618e fc272d5f5a
commit 55acb9809a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,10 +3,10 @@ TEST?=./...
default: test default: test
bin: config/y.go bin: config/y.go
@sh -c "$(CURDIR)/scripts/build.sh" @sh -c "'$(CURDIR)/scripts/build.sh'"
dev: config/y.go dev: config/y.go
@TF_DEV=1 sh -c "$(CURDIR)/scripts/build.sh" @TF_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
test: config/y.go test: config/y.go
TF_ACC= go test $(TEST) $(TESTARGS) -timeout=10s -parallel=4 TF_ACC= go test $(TEST) $(TESTARGS) -timeout=10s -parallel=4

2
scripts/build.sh
View File

@ -9,7 +9,7 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
# Change into that directory # Change into that directory
cd $DIR cd "$DIR"
# Get the git commit # Get the git commit
GIT_COMMIT=$(git rev-parse HEAD) GIT_COMMIT=$(git rev-parse HEAD)