From: Steffen Prohaska Date: Sun, 27 Jul 2008 16:49:43 GMT Subject: [PATCH 3/3] git-gui (Windows): Change wrapper to execdir 'libexec/git-core' Message-ID: <1217177383-25272-4-git-send-email-prohaska@zib.de> In-Reply-To: <1217177383-25272-3-git-send-email-prohaska@zib.de> 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 --- git-gui/windows/git-gui.sh | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git-gui/windows/git-gui.sh b/git-gui/windows/git-gui.sh index 98f32c0..53c3a94 100644 --- a/git-gui/windows/git-gui.sh +++ b/git-gui/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] -- 1.6.0.rc0.79.gb0320