summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-08-04 20:09:46 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-08-05 00:38:17 (GMT)
commit9534c9fb31dfe4c5c367042c97a160c42b1eefdf (patch)
treec4592a6b7c2db0438299000c4ed86c46355f7dab
parentfbbdaa5f425417e7fee83f543b1d03806f034cab (diff)
downloadgit-9534c9fb31dfe4c5c367042c97a160c42b1eefdf.zip
git-9534c9fb31dfe4c5c367042c97a160c42b1eefdf.tar.gz
git-9534c9fb31dfe4c5c367042c97a160c42b1eefdf.tar.bz2
git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
The new execdir is two levels below the root directory, while the old execdir 'bin' was only one level below. This commit adapts the discovery of oguilib that uses relative paths accordingly. We determine whether we have the extra level in the same way in which the Makefile defines sharedir, i.e. whether the last directory part is 'git-core'. Inspired-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 14b2d9a..ad65aaa 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -52,7 +52,11 @@ catch {rename send {}} ; # What an evil concept...
set oguilib {@@GITGUI_LIBDIR@@}
set oguirel {@@GITGUI_RELATIVE@@}
if {$oguirel eq {1}} {
- set oguilib [file dirname [file dirname [file normalize $argv0]]]
+ set oguilib [file dirname [file normalize $argv0]]
+ if {[file tail $oguilib] eq {git-core}} {
+ set oguilib [file dirname $oguilib]
+ }
+ set oguilib [file dirname $oguilib]
set oguilib [file join $oguilib share git-gui lib]
set oguimsg [file join $oguilib msgs]
} elseif {[string match @@* $oguirel]} {