git-gui: Fix gitk search in $PATH to work on Windows

spearce · spearce · commit 79317e5df184 · 2008-07-29T22:41:23.000-07:00
Back in 15430be ("Look for gitk in $PATH, not $LIBEXEC/git-core") git-gui learned to use [_which gitk] to locate where gitk's script is as Git 1.6 will install gitk to $prefix/bin (in $PATH) and all of the other tools are in $gitexecdir. This failed on Windows because _which adds the ".exe" suffix as it searches for the program on $PATH, under the assumption that we can only execute something from Tcl if it is a proper Windows executable. When scanning for gitk on Windows we need to omit the ".exe" suffix. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
diff --git a/git-gui.sh b/git-gui.sh
@@ -317,7 +317,7 @@ proc _git_cmd {name} {
 	return $v
 }
 
-proc _which {what} {
+proc _which {what args} {
 	global env _search_exe _search_path
 
 	if {$_search_path eq {}} {
@@ -340,8 +340,14 @@ proc _which {what} {
 		}
 	}
 
+	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
+		set suffix {}
+	} else {
+		set suffix $_search_exe
+	}
+
 	foreach p $_search_path {
-		set p [file join $p $what$_search_exe]
+		set p [file join $p $what$suffix]
 		if {[file exists $p]} {
 			return [file normalize $p]
 		}
@@ -1686,7 +1692,7 @@ 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 [_which gitk]
+	set exe [_which gitk -script]
 	set cmd [list [info nameofexecutable] $exe]
 	if {$exe eq {}} {
 		error_popup [mc "Couldn't find gitk in PATH"]

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ proc _git_cmd {name} {`
`317`	`317`	`return $v`
`318`	`318`	`}`
`319`	`319`
`320`		`-proc _which {what} {`
	`320`	`+proc _which {what args} {`
`321`	`321`	`global env _search_exe _search_path`
`322`	`322`
`323`	`323`	`if {$_search_path eq {}} {`
`@@ -340,8 +340,14 @@ proc _which {what} {`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
	`343`	`+ if {[is_Windows] && [lsearch -exact $args -script] >= 0} {`
	`344`	`+ set suffix {}`
	`345`	`+ } else {`
	`346`	`+ set suffix $_search_exe`
	`347`	`+ }`
	`348`	`+`
`343`	`349`	`foreach p $_search_path {`
`344`		`- set p [file join $p $what$_search_exe]`
	`350`	`+ set p [file join $p $what$suffix]`
`345`	`351`	`if {[file exists $p]} {`
`346`	`352`	`return [file normalize $p]`
`347`	`353`	`}`
`@@ -1686,7 +1692,7 @@ proc do_gitk {revs} {`
`1686`	`1692`	`# -- Always start gitk through whatever we were loaded with. This`
`1687`	`1693`	`# lets us bypass using shell process on Windows systems.`
`1688`	`1694`	`#`
`1689`		`- set exe [_which gitk]`
	`1695`	`+ set exe [_which gitk -script]`
`1690`	`1696`	`set cmd [list [info nameofexecutable] $exe]`
`1691`	`1697`	`if {$exe eq {}} {`
`1692`	`1698`	`error_popup [mc "Couldn't find gitk in PATH"]`