Re: [PATCH] git-gui: Make git-gui lib dir configurable at runtime

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 21, 2014, 21:06 UTC
Message-ID: <xmqqbnsiifq6.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1405966809-30882-1-git-send-email-dturner@twitter.com>

David Turner <dturner@twopensource.com> writes:

Show 11 quoted lines

> Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
> where to look for TCL libs.  This allows a git-gui which has been
> built with a prefix of /foo to be run out of directory /bar.  This is
> the equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL
> libraries.
>
> Signed-off-by: David Turner <dturner@twitter.com>
> ---
>  git-gui/Makefile   | 3 ++-
>  git-gui/git-gui.sh | 6 +++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)

Would a similar change to gitk necessary/beneficial to platforms that would benefit from this change?

git-gui directory in my tree comes from its upstream repository git://repo.or.cz/git-gui.git/, and it is maintained by Pat Thoyts (Cc'ed).

gitk is from git://ozlabs.org/~paulus/gitk.git maintained by Paul Mackerras <paulus@samba.org> (not Cc'ed).

Note that these two upstream projects do not have leading directories git-gui and gitk-git themselves (they are merged to my tree while their paths being renamed). A patch that is appliable to them would touch paths without them (e.g. Makefile and git-gui.sh for an equivalent of the patch I am responding to).

Thanks.

Show 31 quoted lines

> diff --git a/git-gui/Makefile b/git-gui/Makefile
> index cde8b2e..56bf9e2 100644
> --- a/git-gui/Makefile
> +++ b/git-gui/Makefile
> @@ -177,7 +177,8 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS
>  	echo then >>$@+ && \
>  	echo '	'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
>  	echo else >>$@+ && \
> -	echo '	'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\' \
> +	echo '	libdir="$$(GIT_GUI_LIB_DIR:-$(libdir_SQ))"' >>$@+ && \
> +	echo '	'exec \"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\" \
>  		'"$$0" "$$@"' >>$@+ && \
>  	echo fi >>$@+ && \
>  	chmod +x $@+ && \
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index b186329..6cbb36e 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -49,7 +49,11 @@ catch {rename send {}} ; # What an evil concept...
>  ##
>  ## locate our library
>  
> -set oguilib {@@GITGUI_LIBDIR@@}
> +if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
> +	set oguilib $::env(GIT_GUI_LIB_DIR)
> +} else {
> +	set oguilib {@@GITGUI_LIBDIR@@}
> +}
>  set oguirel {@@GITGUI_RELATIVE@@}
>  if {$oguirel eq {1}} {
>  	set oguilib [file dirname [file normalize $argv0]]