summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2010-02-27 20:47:42 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2010-07-30 08:57:26 (GMT)
commit4c79adc5c05de52a08f5e8a9615c9d6c9fe9a991 (patch)
treeb8e6754ffd0a2c9c4c30fe14b7f34c6b08685004 /windows
parenta197b1e89a1c779e69c5ce8746f13b48158030ac (diff)
downloadgit-4c79adc5c05de52a08f5e8a9615c9d6c9fe9a991.zip
git-4c79adc5c05de52a08f5e8a9615c9d6c9fe9a991.tar.gz
git-4c79adc5c05de52a08f5e8a9615c9d6c9fe9a991.tar.bz2
git-gui: fix PATH environment for mingw development environment
When creating a desktop shortcut from the gui the shortcut directly starts wish with the git-gui script. In the msysgit development environment some dll's reside in the mingw/bin directory which causes that git can not start because libiconv2.dll is not found. When using such a link the error is even more cryptic stating: "child killed: unknown signal" Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'windows')
-rw-r--r--windows/git-gui.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/windows/git-gui.sh b/windows/git-gui.sh
index 66bbb2f..b1845c5 100644
--- a/windows/git-gui.sh
+++ b/windows/git-gui.sh
@@ -13,10 +13,11 @@ if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
incr argc -2
}
-set bindir [file dirname \
+set basedir [file dirname \
[file dirname \
[file dirname [info script]]]]
-set bindir [file join $bindir bin]
+set bindir [file join $basedir bin]
+set bindir "$bindir;[file join $basedir mingw bin]"
regsub -all ";" $bindir "\\;" bindir
set env(PATH) "$bindir;$env(PATH)"
unset bindir