From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Sixt <johannes.sixt@telecom.at>
Cc: Steffen Prohaska <prohaska@zib.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
Date: Mon, 4 Aug 2008 13:00:49 -0700 [thread overview]
Message-ID: <20080804200049.GA29485@spearce.org> (raw)
In-Reply-To: <1217879912.48975f6809e10@webmail.nextra.at>
Johannes Sixt <johannes.sixt@telecom.at> wrote:
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index fd3875a..fa08d49 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 {[lindex [file split $oguilib] end] eq {git-core}} {
> + set oguilib [file dirname $oguilib]
Isn't that what [file tail] does?
if {[file tail $oguilib] eq {git-core}} {
But otherwise this looks good to me. I'll apply it later tonight,
unless you agree that file tail is better here.
--
Shawn.
next prev parent reply other threads:[~2008-08-04 20:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-27 16:49 [PATCH 0/3] git-gui (Windows): Adapt to new execdir 'libexec/git-core' Steffen Prohaska
2008-07-27 16:49 ` [PATCH 1/3] git-gui: Adapt discovery of oguilib to " Steffen Prohaska
2008-07-27 16:49 ` [PATCH 2/3] git-gui (Windows): Switch to relative discovery of oguilib Steffen Prohaska
2008-07-27 16:49 ` [PATCH 3/3] git-gui (Windows): Change wrapper to execdir 'libexec/git-core' Steffen Prohaska
2008-07-27 21:24 ` [PATCH 1/3] git-gui: Adapt discovery of oguilib " Shawn O. Pearce
2008-07-28 5:01 ` Steffen Prohaska
2008-07-30 5:25 ` Shawn O. Pearce
2008-07-30 5:39 ` Steffen Prohaska
2008-08-03 9:35 ` Johannes Sixt
2008-08-03 10:09 ` Steffen Prohaska
2008-08-04 19:58 ` [PATCH] " Johannes Sixt
2008-08-04 20:00 ` Shawn O. Pearce [this message]
2008-08-04 20:09 ` [PATCH v2] " Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080804200049.GA29485@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=johannes.sixt@telecom.at \
--cc=prohaska@zib.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).