go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-19 12:12:42 +02:00
Code Issues Releases Activity

Extract helper function quotedCommandString

Browse Source 
Will be reused in the next commit.
This commit is contained in:
Stefan Haller 2024-08-03 14:55:54 +02:00
parent da94ee7a9a
commit 39e77d1823
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/commands/oscommands/cmd_obj_builder.go
View File

@ -43,10 +43,16 @@ func (self *CmdObjBuilder) NewWithEnviron(args []string, env []string) ICmdObj {
} }
func (self *CmdObjBuilder) NewShell(commandStr string) ICmdObj { func (self *CmdObjBuilder) NewShell(commandStr string) ICmdObj {
var quotedCommand string quotedCommand := self.quotedCommandString(commandStr)
cmdArgs := str.ToArgv(fmt.Sprintf("%s %s %s", self.platform.Shell, self.platform.ShellArg, quotedCommand))
return self.New(cmdArgs)
}
func (self *CmdObjBuilder) quotedCommandString(commandStr string) string {
// Windows does not seem to like quotes around the command // Windows does not seem to like quotes around the command
if self.platform.OS == "windows" { if self.platform.OS == "windows" {
quotedCommand = strings.NewReplacer( return strings.NewReplacer(
"^", "^^", "^", "^^",
"&", "^&", "&", "^&",
"|", "^|", "|", "^|",
@ -54,13 +60,9 @@ func (self *CmdObjBuilder) NewShell(commandStr string) ICmdObj {
">", "^>", ">", "^>",
"%", "^%", "%", "^%",
).Replace(commandStr) ).Replace(commandStr)
} else {
quotedCommand = self.Quote(commandStr)
} }
cmdArgs := str.ToArgv(fmt.Sprintf("%s %s %s", self.platform.Shell, self.platform.ShellArg, quotedCommand)) return self.Quote(commandStr)
return self.New(cmdArgs)
} }
func (self *CmdObjBuilder) CloneWithNewRunner(decorate func(ICmdObjRunner) ICmdObjRunner) *CmdObjBuilder { func (self *CmdObjBuilder) CloneWithNewRunner(decorate func(ICmdObjRunner) ICmdObjRunner) *CmdObjBuilder {