Check shell using env var instead

cmd/completion.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var useZsh bool
 var writeCompletion bool
 
 // completionCmd represents the completion command

cmd/run.go

@@ -5,8 +5,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var useZsh bool
-
 // runCmd represents the run command
 var runCmd = &cobra.Command{
 	Use:   "run [command] [args]",
@@ -40,12 +38,10 @@ commands that need to be run across the scope of the command.`,
 	Args:               cobra.MinimumNArgs(1),
 	DisableFlagParsing: true,
 	Run: func(cmd *cobra.Command, args []string) {
-		task.Run(args, useZsh)
+		task.Run(args)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(runCmd)
-
-	runCmd.Flags().BoolVarP(&useZsh, "zsh", "z", false, "Use zsh for shell exec")
 }

shell/shell.go

@@ -20,14 +20,14 @@ const (
 )
 
 // Run a command on the shell
-func Run(command string, shell Shell, verbose bool) error {
+func Run(command string, verbose bool) error {
 	if len(command) == 0 {
 		return fmt.Errorf("cannot run empty command")
 	}
 
 	command = strings.TrimSuffix(command, "\n")
 
-	name, args := buildExecArgs(shell, command)
+	name, args := buildExecArgs(command)
 	if verbose {
 		log.Debugf("executing: %s %s\n", name, strings.Join(args, " "))
 	}
@@ -88,8 +88,17 @@ func InitFileLines() (string, error) {
 	return prefFiles[0].makeAliasBlock(), nil
 }
 
-func buildExecArgs(sh Shell, cmd string) (string, []string) {
-	if sh == Zsh {
+// Which shell is currently running
+func Which() Shell {
+	sh := os.Getenv("SHELL")
+	if strings.Contains(sh, "zsh") {
+		return Zsh
+	}
+	return Bash
+}
+
+func buildExecArgs(cmd string) (string, []string) {
+	if Which() == Zsh {
 		return "zsh", []string{"-ic", cmd}
 	}
 	return "bash", []string{"-ic", cmd}

shell/startupfile.go

@@ -179,14 +179,9 @@ func (s *startupFile) makeAliasBlock() string {
 		return ""
 	}
 
-	zsh := ""
-	if strings.Contains(s.path, "zsh") {
-		zsh = "--zsh"
-	}
-
 	aliases := []string{}
 	for _, a := range s.aliases {
-		alias := strings.TrimSpace(fmt.Sprintf("alias %s='nostromo run %s \"$*\"' %s", a, a, zsh))
+		alias := strings.TrimSpace(fmt.Sprintf("alias %s='nostromo run %s \"$*\"'", a, a))
 		aliases = append(aliases, alias)
 	}
 	return fmt.Sprintf("\n%s\n%s\n%s\n", beginBlockComment, strings.Join(aliases, "\n"), endBlockComment)

task/task.go

@@ -196,7 +196,7 @@ func RemoveSubstitution(keyPath, alias string) {
 }
 
 // Run a command from the manifest
-func Run(args []string, useZsh bool) {
+func Run(args []string) {
 	cfg := checkConfig()
 	if cfg == nil {
 		return
@@ -208,11 +208,7 @@ func Run(args []string, useZsh bool) {
 		return
 	}
 
-	sh := shell.Bash
-	if useZsh {
-		sh = shell.Zsh
-	}
-	err = shell.Run(cmd, sh, cfg.Manifest.Config.Verbose)
+	err = shell.Run(cmd, cfg.Manifest.Config.Verbose)
 	if err != nil {
 		log.Error(err)
 	}