fix osx support, add additional error context, update comments in shells so that they have a space, don't fail on missing initial shell file

Author: calebdoxsey

bash_dao.go

@@ -12,7 +12,7 @@ import (
 var (
 	bashShell = &shell{
 		configFileName: filepath.Join(os.Getenv("HOME"), ".bashrc"),
-		commentSigil:   "#",
+		commentSigil:   " #",
 		quote: func(value string) string {
 			r := strings.NewReplacer(
 				"\\", "\\\\",

darwin_dao.go

@@ -31,7 +31,7 @@ var (
 
 	darwinShell = &shell{
 		configFileName: filepath.Join(os.Getenv("HOME"), ".config", "penv.sh"),
-		commentSigil:   "#",
+		commentSigil:   " #",
 		quote: func(value string) string {
 			r := strings.NewReplacer(
 				"\\", "\\\\",
@@ -86,14 +86,12 @@ func (dao *DarwinDAO) Save(env *Environment) error {
 
 	plistName := filepath.Join(os.Getenv("HOME"), "Library", "LaunchAgents", "penv.plist")
 
-	_, err = ioutil.WriteFile(
-		plistName,
-		darwinPlist,
-	)
+	err = ioutil.WriteFile(plistName, []byte(darwinPlist), 0777)
 	if err != nil {
 		return err
 	}
 
+	exec.Command("launchctl", "unload", plistName).Run()
 	err = exec.Command("launchctl", "load", plistName).Run()
 	if err != nil {
 		return err

fish_dao.go

@@ -13,7 +13,7 @@ import (
 var (
 	fishShell = &shell{
 		configFileName: filepath.Join(os.Getenv("HOME"), ".config", "fish", "config.fish"),
-		commentSigil:   "#",
+		commentSigil:   " #",
 		quote: func(value string) string {
 			r := strings.NewReplacer(
 				"\\", "\\\\",

penv.go

@@ -102,7 +102,7 @@ func Save(env *Environment) error {
 func AppendEnv(name, value string) error {
 	env, err := Load()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load environment: %v", err)
 	}
 	env.Setters = filter(env.Setters, func(nv NameValue) bool {
 		return nv.Name != name || nv.Value != value
@@ -115,40 +115,53 @@ func AppendEnv(name, value string) error {
 	env.Unsetters = filter(env.Unsetters, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	return Save(env)
+	err = Save(env)
+	if err != nil {
+		return fmt.Errorf("failed to save environment: %v", err)
+	}
+	return nil
 }
 
 // SetEnv permanently sets an environment variable
 func SetEnv(name, value string) error {
-	defs, err := Load()
+	env, err := Load()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load environment: %v", err)
 	}
-	defs.Setters = filter(defs.Setters, func(nv NameValue) bool {
+	env.Setters = filter(env.Setters, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	defs.Setters = append(defs.Setters, NameValue{name, value})
-	defs.Unsetters = filter(defs.Unsetters, func(nv NameValue) bool {
+	env.Setters = append(env.Setters, NameValue{name, value})
+	env.Unsetters = filter(env.Unsetters, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	return Save(defs)
+	err = Save(env)
+	if err != nil {
+		return fmt.Errorf("failed to save environment: %v", err)
+	}
+	return nil
 }
 
 // UnsetEnv permanently unsets an environment variable
 func UnsetEnv(name string) error {
-	defs, err := Load()
+	env, err := Load()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load environment: %v", err)
 	}
-	defs.Setters = filter(defs.Setters, func(nv NameValue) bool {
+	env.Setters = filter(env.Setters, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	defs.Appenders = filter(defs.Appenders, func(nv NameValue) bool {
+	env.Appenders = filter(env.Appenders, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	defs.Unsetters = filter(defs.Unsetters, func(nv NameValue) bool {
+	env.Unsetters = filter(env.Unsetters, func(nv NameValue) bool {
 		return nv.Name != name
 	})
-	defs.Unsetters = append(defs.Unsetters, NameValue{name, ""})
-	return Save(defs)
+	env.Unsetters = append(env.Unsetters, NameValue{name, ""})
+
+	err = Save(env)
+	if err != nil {
+		return fmt.Errorf("failed to save environment: %v", err)
+	}
+	return nil
 }

shell.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"encoding/hex"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -65,7 +66,7 @@ func (sh *shell) Load() (*Environment, error) {
 
 	f, err := os.Open(sh.configFileName)
 	if err != nil {
-		return nil, err
+		return env, nil
 	}
 	defer f.Close()
 
@@ -99,16 +100,20 @@ func (sh *shell) Save(env *Environment) error {
 
 	// generate the new file
 	err := func() error {
-		in, err := os.Open(inName)
+		fi, err := os.Stat(inName)
+		if err != nil {
+			ioutil.WriteFile(inName, []byte{}, 0755)
+			fi, err = os.Stat(inName)
+		}
 		if err != nil {
 			return err
 		}
-		defer in.Close()
 
-		fi, err := in.Stat()
+		in, err := os.Open(inName)
 		if err != nil {
 			return err
 		}
+		defer in.Close()
 
 		out, err := os.OpenFile(outName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fi.Mode())
 		if err != nil {