git-gui: handle textconv filter on Windows and in development

patthoyts · patthoyts · commit d5257fb3c1de · 2010-08-12T21:37:32.000+01:00
When developing/testing we run git-gui.sh directly and the makefile
configured variables are not properly set. Configure the new shellpath
accessor to handle this case.

On Windows we may not find the shell so in this case revert to simply
executing the filter command without the shell intermediate.

Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
diff --git a/git-gui.sh b/git-gui.sh
@@ -139,7 +139,14 @@ if {$_trace >= 0} {
 }
 
 proc shellpath {} {
-	global _shellpath
+	global _shellpath env
+	if {[string match @@* $_shellpath]} {
+		if {[info exists env(SHELL)]} {
+			return $env(SHELL)
+		} else {
+			return /bin/sh
+		}
+	}
 	return $_shellpath
 }
 
diff --git a/lib/blame.tcl b/lib/blame.tcl
@@ -461,8 +461,13 @@ method _load {jump} {
 	if {$commit eq {}} {
 		if {$do_textconv ne 0} {
 			# Run textconv with sh -c "..." to allow it to
-			# contain command + arguments.
-			set fd [open |[list [shellpath] -c "$textconv \"\$0\"" $path] r]
+			# contain command + arguments. On windows, just
+			# call the filter command.
+			if {![file executable [shellpath]]} {
+				set fd [open |[linsert $textconv end $path] r]
+			} else {
+				set fd [open |[list [shellpath] -c "$textconv \"\$0\"" $path] r]
+			}
 		} else {
 			set fd [open $path r]
 		}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,14 @@ if {$_trace >= 0} {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`proc shellpath {} {`
`142`		`- global _shellpath`
	`142`	`+ global _shellpath env`
	`143`	`+ if {[string match @@* $_shellpath]} {`
	`144`	`+ if {[info exists env(SHELL)]} {`
	`145`	`+ return $env(SHELL)`
	`146`	`+ } else {`
	`147`	`+ return /bin/sh`
	`148`	`+ }`
	`149`	`+ }`
`143`	`150`	`return $_shellpath`
`144`	`151`	`}`
`145`	`152`