diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2008-07-27 20:49:43 +0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-07-30 09:43:37 +0400 |
| commit | 5fc6edab76ea16c5fad7138389c2fcc2076534e7 (patch) | |
| tree | 320e89a01513e3630eb681d9524ff835d56f6690 | |
| parent | f57ddcc5ecf16d1fff4b6e222352c3220fe8120f (diff) | |
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 <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | windows/git-gui.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/windows/git-gui.sh b/windows/git-gui.sh index 98f32c0a07..53c3a94686 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] |