Merge pull request deis#22 from mboersma/fix-makeself-perms

fix(installer): use deisctl-hack fork of makeself
mboersma · Sep 9, 2014 · 004ed37 · 004ed37
2 parents 789750d + ba85174
commit 004ed37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 package/
 deisctl/deisctl
+makeself/
 
 # ctags index
 tags

diff --git a/Makefile b/Makefile
@@ -6,7 +6,8 @@ build:
 installer:
 	rm -rf dist && mkdir -p dist
 	godep go build -a -o dist/deisctl .
-	makeself.sh --bzip2 --nox11 --target /usr/local/bin dist \
+	@if [ ! -d makeself ]; then git clone -b deisctl-hack https://github.com/deis/makeself.git; fi
+	PATH=./makeself:$$PATH makeself.sh --bzip2 --nox11 --target /usr/local/bin dist \
 		dist/deisctl-`cat deis-version`-`go env GOOS`-`go env GOARCH`.run \
 		"Deis Control Utility" "/usr/local/bin/deisctl refresh-units"