From c5a67411ce1af7f12184ed3d645c794674cea8f9 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 4 Nov 2010 17:53:21 +0100
Subject: Allow installer to take redistributables from VC9

---
 erts/etc/win32/nsis/find_redist.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 erts/etc/win32/nsis/find_redist.sh

(limited to 'erts/etc/win32/nsis/find_redist.sh')

diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
old mode 100755
new mode 100644
index c5572839c5..de6ebc8e31
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -108,15 +108,28 @@ for x in cl bin vc; do
     BPATH="$NBPATH"
 done
 #echo $BPATH
-for x in sdk v2.0 bootstrapper packages vcredist_x86 vcredist_x86.exe; do
+STARTPATH=$BPATH
+for verdir in v2.0 v3.5; do
+BPATH=$STARTPATH
+fail=false
+for x in sdk $verdir bootstrapper packages vcredist_x86 vcredist_x86.exe; do
     #echo "x=$x"
     #echo "BPATH=$BPATH"
     NBPATH=`add_path_element $x "$BPATH"`
     if [ "$NBPATH" = "$BPATH" ]; then
-	echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
-	exit 3
+	fail=true
+	break;
     fi
     BPATH="$NBPATH"
 done
-echo $BPATH
-exit 0
\ No newline at end of file
+if [ $fail = false ]; then
+    break;
+fi
+done
+if [ $fail = false ]; then
+    echo $BPATH
+    exit 0
+else
+    echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
+    exit 3
+fi
-- 
cgit v1.2.3