NSIS installers fortified

tschoonj · Feb 14, 2014 · 061ca87 · 061ca87
1 parent 7bb2906
commit 061ca87
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/nsis/xmimsim-win32.nsi.in b/nsis/xmimsim-win32.nsi.in
@@ -157,9 +157,16 @@ ${Endif}
 
 xraylib_install:
 DetailPrint "xraylib download has succeeded. Installing..."
-ExecWait '"xraylib-${XRAYLIB_VERSION}-win32.exe" /S'
+ExecWait '"xraylib-${XRAYLIB_VERSION}-win32.exe" /VERYSILENT /SP-' $0
 Delete "xraylib-${XRAYLIB_VERSION}-win32.exe"
 
+${If} $0 == 0
+	Goto gtk2install
+${Else}
+	DetailPrint "Error when installing xraylib: $0"
+	MessageBox MB_OK "Error when installing xraylib: $0. Aborting"
+	Abort "xraylib installation failed with error: $0"
+${Endif}
 
 !endif
 

diff --git a/nsis/xmimsim-win64.nsi.in b/nsis/xmimsim-win64.nsi.in
@@ -151,9 +151,17 @@ ${Endif}
 
 xraylib_install:
 DetailPrint "xraylib download has succeeded. Installing..."
-ExecWait '"xraylib-${XRAYLIB_VERSION}-win64.exe" /S'
+ExecWait '"xraylib-${XRAYLIB_VERSION}-win64.exe" /VERYSILENT /SP-' $0
 Delete "xraylib-${XRAYLIB_VERSION}-win64.exe"
 
+${If} $0 == 0
+	Goto gtk2install
+${Else}
+	DetailPrint "Error when installing xraylib: $0"
+	MessageBox MB_OK "Error when installing xraylib: $0. Aborting"
+	Abort "xraylib installation failed with error: $0"
+${Endif}
+
 
 !endif