diff options
| author | Patrik Nyblom <[email protected]> | 2010-11-04 17:53:21 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-11-30 16:30:47 +0100 |
| commit | c5a67411ce1af7f12184ed3d645c794674cea8f9 (patch) | |
| tree | c1d8f75fb2ee707e22161d5aae0ca77a429542d2 /erts/etc/win32/nsis/find_redist.sh | |
| parent | 63eeba2f6829aac2644eaf212ebef9cdf4b59e8d (diff) | |
| download | otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.gz otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.bz2 otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.zip | |
Allow installer to take redistributables from VC9
Diffstat (limited to 'erts/etc/win32/nsis/find_redist.sh')
| -rw-r--r--[-rwxr-xr-x] | erts/etc/win32/nsis/find_redist.sh | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh index c5572839c5..de6ebc8e31 100755..100644 --- 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 |