diff options
| author | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:27 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:27 -0400 |
| commit | afca9a4fb4e3c8acbc464bca69cde5c7397c25e1 (patch) | |
| tree | 80b620507f14e2c9887879ca0dd152ee39e8dd8e /lib | |
| parent | 44e3935d53e3c0b00ff35bea4fcf8e1731ee4f9b (diff) | |
| parent | a1ccd2512072cf52835050f4c97a4fba9f0ec8f9 (diff) | |
| download | git-afca9a4fb4e3c8acbc464bca69cde5c7397c25e1.tar.xz | |
Merge branch 'ml/replace-auto-execok' into js/fix-open-exec
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/shortcut.tcl | 2 | ||||
| -rw-r--r-- | lib/sshkey.tcl | 3 | ||||
| -rw-r--r-- | lib/tools.tcl | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl index d437ea6933..1d01d9cbfa 100644 --- a/lib/shortcut.tcl +++ b/lib/shortcut.tcl @@ -12,7 +12,7 @@ proc do_windows_shortcut {} { set fn ${fn}.lnk } # Use git-gui.exe if available (ie: git-for-windows) - set cmdLine [auto_execok git-gui.exe] + set cmdLine [list [_which git-gui]] if {$cmdLine eq {}} { set cmdLine [list [info nameofexecutable] \ [file normalize $::argv0]] diff --git a/lib/sshkey.tcl b/lib/sshkey.tcl index b32bdd06e9..c3e681b899 100644 --- a/lib/sshkey.tcl +++ b/lib/sshkey.tcl @@ -83,7 +83,8 @@ proc make_ssh_key {w} { set sshkey_title [mc "Generating..."] $w.header.gen configure -state disabled - set cmdline [list sh -c {echo | ssh-keygen -q -t rsa -f ~/.ssh/id_rsa 2>&1}] + set cmdline [list [shellpath] -c \ + {echo | ssh-keygen -q -t rsa -f ~/.ssh/id_rsa 2>&1}] if {[catch { set sshkey_fd [safe_open_command $cmdline] } err]} { error_popup [mc "Could not start ssh-keygen:\n\n%s" $err] diff --git a/lib/tools.tcl b/lib/tools.tcl index 142ffceedd..48fddfd814 100644 --- a/lib/tools.tcl +++ b/lib/tools.tcl @@ -110,14 +110,14 @@ proc tools_exec {fullname} { set cmdline $repo_config(guitool.$fullname.cmd) if {[is_config_true "guitool.$fullname.noconsole"]} { - tools_run_silent [list sh -c $cmdline] \ + tools_run_silent [list [shellpath] -c $cmdline] \ [list tools_complete $fullname {}] } else { regsub {/} $fullname { / } title set w [console::new \ [mc "Tool: %s" $title] \ [mc "Running: %s" $cmdline]] - console::exec $w [list sh -c $cmdline] \ + console::exec $w [list [shellpath] -c $cmdline] \ [list tools_complete $fullname $w] } |