Add default type selection in .ducker.yaml and --run-cmd will implici…

…tly make no shell to run. (#20)
JeiKeiLim · Feb 7, 2023 · a583269 · a583269
1 parent f3019dc
commit a583269
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/cmd/ducker/ducker.go b/cmd/ducker/ducker.go
@@ -78,7 +78,6 @@ func dockerRun(ctx *cli.Context, dockerTag string) {
 	dockerArgs := ctx.String("docker-args")
 	shellType := ctx.String("shell")
 	mountPWD := ctx.Bool("mount-pwd")
-	shellCmd := "/bin/bash"
 	dockerOpt := "-tid"
 
 	runOption := ""
@@ -87,12 +86,20 @@ func dockerRun(ctx *cli.Context, dockerTag string) {
 		runOption += localConfig.GetRunArg()
 	}
 
-	if shellType == "zsh" {
+	shellCmd := "/bin/bash"
+
+  if shellType == "default" {
+    shellType = localConfig.Default_Shell
+  }
+  if shellType == "zsh" {
 		shellCmd = "/usr/bin/zsh"
-	} else if shellType == "nosh" {
-		shellCmd = ctx.String("run-cmd")
-		dockerOpt = "-ti"
+	} else if shellType == "bash" {
+    shellCmd = "/bin/bash"
 	}
+  if ctx.String("run-cmd") != "" {
+    shellCmd = ctx.String("run-cmd")
+    dockerOpt = "-ti"
+  }
 
 	runCmd := "docker run " + dockerOpt + " "
 	runCmd += runOption
@@ -133,7 +140,7 @@ func dockerRun(ctx *cli.Context, dockerTag string) {
 	localConfig.LastExecID = lastContainerID
 	localConfig.Write(getDefaultLocalConfigPath())
 
-	if shellType != "nosh" {
+  if ctx.String("run-cmd") == "" {
 		dockerExec(ctx)
 	}
 }
@@ -144,8 +151,14 @@ func dockerExec(ctx *cli.Context) {
 	shellType := ctx.String("shell")
 	shellCmd := "/bin/bash"
 
-	if shellType == "zsh" {
+  if shellType == "default" {
+    shellType = localConfig.Default_Shell
+  }
+
+  if shellType == "zsh" {
 		shellCmd = "/usr/bin/zsh"
+	} else if shellType == "bash" {
+    shellCmd = "/bin/bash"
 	}
 
 	lastContainerID := localConfig.LastExecID
@@ -400,9 +413,9 @@ func main() {
 					&cli.StringFlag{
 						Name:        "shell",
 						Aliases:     []string{"s"},
-						Usage:       "Shell type to run (bash, zsh, nosh)",
-						Value:       "zsh",
-						DefaultText: "zsh",
+						Usage:       "Shell type to run (default, bash, zsh)",
+						Value:       "default",
+						DefaultText: "default",
 					},
 					&cli.BoolFlag{
 						Name:    "mount-pwd",
@@ -412,7 +425,7 @@ func main() {
 					&cli.StringFlag{
 						Name:        "run-cmd",
 						Aliases:     []string{"r"},
-						Usage:       "Running command (only applies when shell=nosh)",
+						Usage:       "Running command (Shell will not be executed)",
 						Value:       "",
 						DefaultText: "",
 					},

diff --git a/cmd/ducker/local_config.go b/cmd/ducker/local_config.go
@@ -16,6 +16,7 @@ type LocalConfig struct {
 	Run_Arg    []string
 	Build_Arg  []string
 	Mount_PWD  bool
+  Default_Shell string
 	LastExecID string
 }
 
@@ -34,6 +35,7 @@ func getDefaultLocalConfig() LocalConfig {
 			"--build-arg UID=" + getTerminalCmdOut("id", "-u"),
 			"--build-arg GID=" + getTerminalCmdOut("id", "-g"),
 		},
+    Default_Shell: "zsh",
 		Mount_PWD: true,
 	}