[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=99235e8

The following commit has been merged in the master branch:
commit 99235e8a6fe8aa8129e1cdceeaf20bdae60dd4f7
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 15 15:10:07 2015 +0000

    #1109 and #1041.  Reinstate recursive cygwin bash
---
 jenkins_build.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jenkins_build.sh b/jenkins_build.sh
index b9d40d3..49db985 100755
--- 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
   ;;
 

-- 
exiv2 packaging