From: Abhijit Menon-Sen <ams@toroid.org>
Date: Thu, 24 Jul 2008 13:28:53 +0000 (+0530)
Subject: git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
X-Git-Tag: v1.6.0-rc1~17^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=15430be5a1d17b888b45b608daab7573f24cf9f1;p=git.git

git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core

Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index 83e264571..7c27a43a5 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1686,10 +1686,10 @@ proc do_gitk {revs} {
 	# -- Always start gitk through whatever we were loaded with.  This
 	#    lets us bypass using shell process on Windows systems.
 	#
-	set exe [file join [file dirname $::_git] gitk]
+	set exe [_which gitk]
 	set cmd [list [info nameofexecutable] $exe]
-	if {! [file exists $exe]} {
-		error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
+	if {$exe eq {}} {
+		error_popup [mc "Couldn't find gitk in PATH"]
 	} else {
 		global env