mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 10:41:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Port the fish setup function to Go

Browse Source
This commit is contained in:
Kovid Goyal
2023-06-25 20:34:48 +05:30
parent 092e0fba2c
commit 3a76ccf10b
3 changed files with 101 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tui/run.go
View File

@@ -125,7 +125,7 @@ func RunShell(shell_cmd []string, shell_integration_env_var_val string) (err err
env[k] = v
}
}
argv, env, err := shell_integration.Setup(shell_name, shell_cmd, env)
argv, env, err := shell_integration.Setup(shell_name, shell_integration_env_var_val, shell_cmd, env)
if err != nil {
return err
}
@@ -134,18 +134,20 @@ func RunShell(shell_cmd []string, shell_integration_env_var_val string) (err err
}
exe := shell_cmd[0]
if runtime.GOOS == "darwin" {
// ensure shell runs in login mode
// ensure shell runs in login mode. On macOS lots of people use ~/.bash_profile instead of ~/.bashrc
// which means they expect the shell to run in login mode always. Le Sigh.
shell_cmd[0] = "-" + filepath.Base(shell_cmd[0])
}
var env []string
if shell_env != nil {
env := make([]string, 0, len(shell_env))
env = make([]string, 0, len(shell_env))
for k, v := range shell_env {
env = append(env, fmt.Sprintf("%s=%s", k, v))
}
} else {
env = os.Environ()
}
// fmt.Println(fmt.Sprintf("%s %v\n%#v", utils.FindExe(exe), shell_cmd, env))
return unix.Exec(utils.FindExe(exe), shell_cmd, env)
}