Merge pull request #775 from xfoxfu/master

jandubois · web-flow · commit 68229f27df8c · 2022-04-05T20:55:34.000-07:00
regard linux default shell
diff --git a/cmd/limactl/shell.go b/cmd/limactl/shell.go
@@ -108,7 +108,7 @@ func shellAction(cmd *cobra.Command, args []string) error {
 	}
 	logrus.Debugf("changeDirCmd=%q", changeDirCmd)
 
-	script := fmt.Sprintf("%s ; exec bash --login", changeDirCmd)
+	script := fmt.Sprintf("%s ; exec $SHELL --login", changeDirCmd)
 	if len(args) > 1 {
 		script += fmt.Sprintf(
 			" -c %s",

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func shellAction(cmd *cobra.Command, args []string) error {`
`108`	`108`	`}`
`109`	`109`	`logrus.Debugf("changeDirCmd=%q", changeDirCmd)`
`110`	`110`
`111`		`- script := fmt.Sprintf("%s ; exec bash --login", changeDirCmd)`
	`111`	`+ script := fmt.Sprintf("%s ; exec $SHELL --login", changeDirCmd)`
`112`	`112`	`if len(args) > 1 {`
`113`	`113`	`script += fmt.Sprintf(`
`114`	`114`	`" -c %s",`