From git Mon Aug 04 20:09:46 2008 From: Johannes Sixt Date: Mon, 04 Aug 2008 20:09:46 +0000 To: git Subject: [PATCH v2] git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' Message-Id: <1217880586.4897620ad4e6a () webmail ! nextra ! at> X-MARC-Message: https://marc.info/?l=git&m=121788059720216 The new execdir has 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 Signed-off-by: Johannes Sixt --- Zitat von "Shawn O. Pearce" : > Johannes Sixt wrote: > > + if {[lindex [file split $oguilib] end] eq {git-core}} { > > Isn't that what [file tail] does? Yes, it is. I missed it in the myriad of file's options. Here's the updated version of the patch. -- Hannes git-gui/git-gui.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index fd3875a..60f376d 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]} { -- 1.6.0.rc1.958.gb3893 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html