From d5257fb3c1decc1eff296a0ae2afbcaee28d0f2c Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Sat, 7 Aug 2010 20:32:13 +0100 Subject: git-gui: handle textconv filter on Windows and in development 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 --- git-gui.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'git-gui.sh') diff --git a/git-gui.sh b/git-gui.sh index 8ade423eb4..0d5c5e389e 100755 --- 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 } -- cgit v1.3