{"thread":{"id":"37184","subject":"[PATCH v2] git-gui: Make git-gui lib dir configurable at runime","startedAt":"2014-07-21T20:41:38Z","lastAt":"2014-07-21T20:41:38Z","messageCount":1,"participants":["David Turner"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"246480","messageId":"1405975298-16304-1-git-send-email-dturner@twitter.com","threadId":"37184","inReplyTo":null,"subject":"[PATCH v2] git-gui: Make git-gui lib dir configurable at runime","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2014-07-21T20:41:38Z","receivedAt":"2014-07-21T20:41:38Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui\nwhere to look for TCL libs.  This allows a git-gui which has been\nbuilt with a prefix of /foo to be run out of directory /bar.  This is\nthe equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL\nlibraries.\n\nSigned-off-by: David Turner <dturner@twitter.com>\n---\n git-gui/Makefile           | 3 ++-\n git-gui/git-gui.sh         | 6 +++++-\n git-gui/macosx/AppMain.tcl | 7 ++++++-\n 3 files changed, 13 insertions(+), 3 deletions(-)\n\ndiff --git a/git-gui/Makefile b/git-gui/Makefile\nindex cde8b2e..4f00bdd 100644\n--- a/git-gui/Makefile\n+++ b/git-gui/Makefile\n@@ -177,7 +177,8 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS\n \techo then >>$@+ && \\\n \techo '\t'echo \\'git-gui version '$(GITGUI_VERSION)'\\' >>$@+ && \\\n \techo else >>$@+ && \\\n-\techo '\t'exec \\''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \\,,$(TKEXECUTABLE))'\\' \\\n+\techo '\tlibdir=\"$${GIT_GUI_LIB_DIR:-$(libdir_SQ)}\"' >>$@+ && \\\n+\techo '\t'exec \\\"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \\,,$(TKEXECUTABLE))'\\\" \\\n \t\t'\"$$0\" \"$$@\"' >>$@+ && \\\n \techo fi >>$@+ && \\\n \tchmod +x $@+ && \\\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex b186329..6cbb36e 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -49,7 +49,11 @@ catch {rename send {}} ; # What an evil concept...\n ##\n ## locate our library\n \n-set oguilib {@@GITGUI_LIBDIR@@}\n+if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {\n+\tset oguilib $::env(GIT_GUI_LIB_DIR)\n+} else {\n+\tset oguilib {@@GITGUI_LIBDIR@@}\n+}\n set oguirel {@@GITGUI_RELATIVE@@}\n if {$oguirel eq {1}} {\n \tset oguilib [file dirname [file normalize $argv0]]\ndiff --git a/git-gui/macosx/AppMain.tcl b/git-gui/macosx/AppMain.tcl\nindex 738bdd0..b6c6dc3 100644\n--- a/git-gui/macosx/AppMain.tcl\n+++ b/git-gui/macosx/AppMain.tcl\n@@ -1,5 +1,10 @@\n set gitexecdir {@@gitexecdir@@}\n-set gitguilib  {@@GITGUI_LIBDIR@@}\n+if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {\n+\tset gitguilib $::env(GIT_GUI_LIB_DIR)\n+} else {\n+\tset gitguilib {@@GITGUI_LIBDIR@@}\n+}\n+\n set env(PATH) \"$gitexecdir:$env(PATH)\"\n \n if {[string first -psn [lindex $argv 0]] == 0} {\n-- \n1.9.1\n"}]}