From: Steffen Prohaska Date: Sun, 27 Jul 2008 16:49:43 +0000 (+0200) Subject: git-gui (Windows): Change wrapper to execdir 'libexec/git-core' X-Git-Tag: v1.6.0-rc2~3^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5fc6edab76ea16c5fad7138389c2fcc2076534e7;p=git.git git-gui (Windows): Change wrapper to execdir 'libexec/git-core' git-gui needs bindir in PATH to be able to run 'git'. bindir however is not necessarily in PATH if started directly through a Windows shortcut. Therefore, we used to add the directory git-gui is located in. But with the new 'libexec/git-core' layout this directory is no longer identical to bindir. This commit modifies the wrapper script to discover the bindir and add it to PATH. Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce --- diff --git a/windows/git-gui.sh b/windows/git-gui.sh index 98f32c0a0..53c3a9468 100644 --- a/windows/git-gui.sh +++ b/windows/git-gui.sh @@ -8,9 +8,12 @@ if { $argc >=2 && [lindex $argv 0] == "--working-dir" } { incr argc -2 } -set gitguidir [file dirname [info script]] -regsub -all ";" $gitguidir "\\;" gitguidir -set env(PATH) "$gitguidir;$env(PATH)" -unset gitguidir +set bindir [file dirname \ + [file dirname \ + [file dirname [info script]]]] +set bindir [file join $bindir bin] +regsub -all ";" $bindir "\\;" bindir +set env(PATH) "$bindir;$env(PATH)" +unset bindir source [file join [file dirname [info script]] git-gui.tcl]