fix: do not quote config for elvish and xonsh

resolves #3740 #3739
This commit is contained in:
Jan De Dobbeleer 2023-04-22 08:51:56 +02:00 committed by Jan De Dobbeleer
parent 8d8d06d4c8
commit b2e1b041e3

View file

@ -180,11 +180,12 @@ func Init(env platform.Environment) string {
case PWSH, PWSH5: case PWSH, PWSH5:
command = "(@(& %s init %s --config=%s --print%s) -join \"`n\") | Invoke-Expression" command = "(@(& %s init %s --config=%s --print%s) -join \"`n\") | Invoke-Expression"
config = quotePwshStr(env.Flags().Config) config = quotePwshStr(env.Flags().Config)
executable = quotePwshStr(executable)
case ELVISH: case ELVISH:
command = "eval (%s init %s --config=%s --print%s | slurp)" 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: case ZSH, BASH, FISH, CMD, TCSH, XONSH:
return PrintInit(env) return PrintInit(env)
case NU: case NU:
@ -246,12 +247,8 @@ func PrintInit(env platform.Environment) string {
configFile = quotePosixStr(configFile) configFile = quotePosixStr(configFile)
script = tcshInit script = tcshInit
case ELVISH: case ELVISH:
executable = quotePosixStr(executable)
configFile = quotePosixStr(configFile)
script = elvishInit script = elvishInit
case XONSH: case XONSH:
executable = quotePosixStr(executable)
configFile = quotePosixStr(configFile)
script = xonshInit script = xonshInit
default: default:
return fmt.Sprintf("echo \"No initialization script available for %s\"", shell) return fmt.Sprintf("echo \"No initialization script available for %s\"", shell)