Merge pull request #94 from mboersma/fix-home-load-units

fix(deisctl): Use $HOME/.deis/units, don't expand tilde (~) shortcut

Author: mboersma

backend/fleet/unit.go

@@ -10,13 +10,12 @@ import (
 	"strings"
 
 	"github.com/coreos/fleet/unit"
-	"github.com/deis/deisctl/utils"
 )
 
 // path hierarchy for finding systemd service templates
 var templatePaths = []string{
 	os.Getenv("DEISCTL_UNITS"),
-	"~/.deis/units",
+	os.Getenv("HOME") + "/.deis/units",
 	"/var/lib/deis/units",
 }
 
@@ -121,7 +120,6 @@ func readTemplate(component string) (out []byte, err error) {
 		if p == "" {
 			continue
 		}
-		p, _ := utils.ExpandUser(p)
 		filename := path.Join(p, templateName)
 		if _, err := os.Stat(filename); err == nil {
 			templateFile = filename

cmd/cmd.go

@@ -288,7 +288,7 @@ Options:
 		fmt.Printf("Error: %v\n", err)
 		os.Exit(2)
 	}
-	dir, _ := utils.ExpandUser(args["--path"].(string))
+	dir := args["--path"].(string)
 	// create the target dir if necessary
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return err

utils/utils.go

@@ -12,7 +12,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"os/user"
 	"path/filepath"
 	"strings"
 	"syscall"
@@ -258,15 +257,6 @@ func nLines(s string) int {
 	return strings.Count(s, "\n")
 }
 
-// ExpandUser replaces "~" in a string with the current user's home directory.
-func ExpandUser(path string) (string, error) {
-	user, err := user.Current()
-	if err != nil {
-		return path, err
-	}
-	return strings.Replace(path, "~/", user.HomeDir+"/", 1), nil
-}
-
 // DeisIfy returns a pretty-printed deis logo along with the corresponding message
 func DeisIfy(message string) string {
 	circle := "\033[31m●"