summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-06 20:32:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-06 20:32:18 (GMT)
commitd96ca27e1089a190139591ac365873f26bffcf5c (patch)
tree93782a459cfd8029268e5f09747b504915ac275c /git-gui/git-gui.sh
parent847d10f56d7853cd0e139a7c2e6ad0ad2de5c464 (diff)
parent9534c9fb31dfe4c5c367042c97a160c42b1eefdf (diff)
downloadgit-d96ca27e1089a190139591ac365873f26bffcf5c.zip
git-d96ca27e1089a190139591ac365873f26bffcf5c.tar.gz
git-d96ca27e1089a190139591ac365873f26bffcf5c.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' git-gui: add a part about format strings in po/README git-gui: update po/it.po git-gui: update Japanese translation git-gui: Update swedish translation. git-gui: Update git-gui.pot for 0.11 nearing release git-gui: Update German translation
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 14b2d9a..ad65aaa 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/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]} {