Merge pull request #60 from gabrtv/fix-edit

fix(edit): construct correct abspath to skel directory

helm/action/create.go

@@ -3,7 +3,6 @@ package action
 import (
 	"os"
 	"path"
-	"path/filepath"
 )
 
 import (
@@ -16,7 +15,8 @@ import (
 // - homeDir is the helm home directory for the user
 func Create(chartName, homeDir string) {
 
-	skeletonDir, _ := filepath.Abs("skel")
+	skeletonDir := path.Join(homeDir, CachePath, "skel")
+
 	if fi, err := os.Stat(skeletonDir); err != nil {
 		log.Die("Could not find %s: %s", skeletonDir, err)
 	} else if !fi.IsDir() {

helm/action/edit.go

@@ -43,10 +43,12 @@ func Edit(chartName, homeDir string) {
 	if err != nil {
 		log.Die("could not open tempfile: %v", err)
 	}
-	defer os.Remove(f.Name())
 	f.Write(contents.Bytes())
 	f.Close()
 
+	// NOTE: removing the tempfile causes issues with editors
+	// that fork, so we let the OS remove them later
+
 	openEditor(f.Name())
 	saveChart(chartDir, f.Name())
 
@@ -125,12 +127,11 @@ func openEditor(filename string) {
 		log.Die("must set shell $EDITOR")
 	}
 
-	cmd = exec.Command(editor, filename)
+	args := []string{filename}
+	cmd = exec.Command(editor, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-
-	// TODO: figure out why editor always exits non-zero
 	cmd.Run()
 }