git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
authorSteffen Prohaska <prohaska@zib.de>
Sun, 27 Jul 2008 16:49:43 +0000 (18:49 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 30 Jul 2008 05:43:37 +0000 (22:43 -0700)
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 <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
windows/git-gui.sh
index 98f32c0a071146a202b3d8589576db26974ccbfa..53c3a94686813936445efbb055dc4f02885c70e9 100644 (file)
@@ -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]