Merge pull request #2034 from mboersma/1957-deisctl-installer-fixes

fix(deisctl): refresh-units uses $HOME/.deis/units by default

Author: mboersma

README.md

@@ -54,7 +54,7 @@ $ ssh-add ~/.vagrant.d/insecure_private_key
 Install the [deisctl utility](deisctl#installation) used to provision and operate Deis.
 
 ```console
-$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh
+$ curl -sSL http://deis.io/deisctl/install.sh | sh
 ```
 
 Export `DEISCTL_TUNNEL` so you can connect to one of the VMs using the `deisctl` client on your workstation.

contrib/coreos/user-data

@@ -50,7 +50,7 @@ coreos:
 
       [Service]
       Type=oneshot
-      ExecStart=/usr/bin/sh -c 'curl -sSL http://deis.io/deisctl/install.sh | sh'
+      ExecStart=/usr/bin/sh -c 'curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.13.0-dev'
 write_files:
   - path: /etc/deis-release
     content: |

deisctl/Makefile

@@ -10,10 +10,17 @@ build:
 installer:
 	rm -rf dist && mkdir -p dist
 	CGO_ENABLED=0 godep go build -a -ldflags '-s' -o dist/deisctl .
-	@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 \
+	@if [ ! -d makeself ]; then git clone -b single-binary https://github.com/deis/makeself.git; fi
+	PATH=./makeself:$$PATH BINARY=deisctl makeself.sh --bzip2 --current --nox11 dist \
 		dist/deisctl-`cat deis-version`-`go env GOOS`-`go env GOARCH`.run "Deis Control Utility" \
-		"deisctl refresh-units && chmod 755 /var/lib/deis /var/lib/deis/units && chmod -R 644 /var/lib/deis/units/*"
+		"./deisctl refresh-units \
+		&& echo \
+		&& echo '\033[0;36mdeisctl\033[0m is in the current directory and unit files are' \
+		&& echo 'in $$HOME/.deis/units. Please move \033[0;36mdeisctl\033[0m to a' \
+		&& echo 'directory in your search PATH.' \
+		&& echo \
+		&& echo 'See http://docs.deis.io/ for documentation.' \
+		&& echo"
 
 install:
 	godep go install -v .

deisctl/README.md

@@ -9,7 +9,7 @@
 To install the latest `deisctl` on Linux or Mac OS X, run this command:
 
 ```console
-$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh
+$ curl -sSL http://deis.io/deisctl/install.sh | sh
 ```
 
 The installer puts `deisctl` in */usr/local/bin* and downloads current Deis unit files
@@ -46,8 +46,8 @@ Then, export the `DEISCTL_UNITS` environment variable so deisctl can find the un
 $ export DEISCTL_UNITS="$PATH_TO_DEISCTL/units"
 ```
 
-This is also useful for specifying custom behavior on Deis units, such as using 
-fleet metadata to lock the builder to a more powerful node, or keep application 
+This is also useful for specifying custom behavior on Deis units, such as using
+fleet metadata to lock the builder to a more powerful node, or keep application
 nodes free of control plane elements.
 
 ## Remote Configuration

deisctl/backend/fleet/unit.go

@@ -14,7 +14,7 @@ import (
 // path hierarchy for finding systemd service templates
 var templatePaths = []string{
 	os.Getenv("DEISCTL_UNITS"),
-	os.Getenv("HOME") + "/.deis/units",
+	path.Join(os.Getenv("HOME"), ".deis", "units"),
 	"/var/lib/deis/units",
 }
 

deisctl/cmd/cmd.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -283,7 +284,7 @@ Usage:
   deisctl refresh-units [-p <target>] [-t <tag>]
 
 Options:
-  -p --path=<target>   where to save unit files [default: /var/lib/deis/units]
+  -p --path=<target>   where to save unit files [default: $HOME/.deis/units]
   -t --tag=<tag>       git tag, branch, or SHA to use when downloading unit files
                        [default: master]
 `
@@ -294,6 +295,9 @@ Options:
 		os.Exit(2)
 	}
 	dir := args["--path"].(string)
+	if dir == "$HOME/.deis/units" || dir == "~/.deis/units" {
+		dir = path.Join(os.Getenv("HOME"), ".deis", "units")
+	}
 	// create the target dir if necessary
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return err

tests/bin/test-latest.sh

@@ -26,7 +26,7 @@ log_phase "Installing clients"
 make -C client build
 
 # install latest deisctl from the website
-curl -sSL http://deis.io/deisctl/install.sh | sudo sh
+curl -sSL http://deis.io/deisctl/install.sh | sh
 
 # ensure we use distributed unit files
 unset DEISCTL_UNITS