#1109 and #1041. Reinstate recursive cygwin bash

2015-12-15 15:10:07 +00:00 · 2015-12-15 15:10:07 +00:00 · 99235e8a6f
commit 99235e8a6f
parent c15fc94311
1 changed files with 12 additions and 6 deletions
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@ -174,12 +174,18 @@ case "$build" in
 			/usr/local/bin/exiv2 -v -V
 			result=$?
        else
-			export RECURSIVE=1
-			# don't recursively invoke bash as this dies on Windows 10.
-			# simply call the script again in the same bash session
-			# /cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
-			./$0
-			result=$?
+			if [ "$x64" == true ]; then
+				export RECURSIVE=1
+				# /cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
+				cd "$PWD" ; ./$0
+				result=$?
+			fi
+			if [ "$Win32" == true ]; then
+				export RECURSIVE=1
+				# /cygdrive/c/cygwin/bin/bash.exe -c "cd $PWD ; ./$0"
+				cd "$PWD" ; ./$0
+				result=$?
+			fi
        fi
  ;;