From b2e1b041e318328a76b444c31ad47e78623dae14 Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Sat, 22 Apr 2023 08:51:56 +0200 Subject: [PATCH] fix: do not quote config for elvish and xonsh resolves #3740 #3739 --- src/shell/init.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/shell/init.go b/src/shell/init.go index 48fb4c30..09ce99cc 100644 --- a/src/shell/init.go +++ b/src/shell/init.go @@ -180,11 +180,12 @@ func Init(env platform.Environment) string { case PWSH, PWSH5: command = "(@(& %s init %s --config=%s --print%s) -join \"`n\") | Invoke-Expression" config = quotePwshStr(env.Flags().Config) + executable = quotePwshStr(executable) case ELVISH: command = "eval (%s init %s --config=%s --print%s | slurp)" - config = quotePosixStr(env.Flags().Config) + config = env.Flags().Config } - return fmt.Sprintf(command, quotePwshStr(executable), shell, config, additionalParams) + return fmt.Sprintf(command, executable, shell, config, additionalParams) case ZSH, BASH, FISH, CMD, TCSH, XONSH: return PrintInit(env) case NU: @@ -246,12 +247,8 @@ func PrintInit(env platform.Environment) string { configFile = quotePosixStr(configFile) script = tcshInit case ELVISH: - executable = quotePosixStr(executable) - configFile = quotePosixStr(configFile) script = elvishInit case XONSH: - executable = quotePosixStr(executable) - configFile = quotePosixStr(configFile) script = xonshInit default: return fmt.Sprintf("echo \"No initialization script available for %s\"", shell)