[QGIS Commit] r15643 - trunk/qgis/ms-windows

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-30 07:43:18 -0700 (Wed, 30 Mar 2011)
New Revision: 15643

Modified:
   trunk/qgis/ms-windows/QGIS-Installer.nsi
Log:
fix nsis installer

Modified: trunk/qgis/ms-windows/QGIS-Installer.nsi
===================================================================
--- trunk/qgis/ms-windows/QGIS-Installer.nsi	2011-03-30 13:27:32 UTC (rev 15642)
+++ trunk/qgis/ms-windows/QGIS-Installer.nsi	2011-03-30 14:43:18 UTC (rev 15643)
@@ -427,8 +427,13 @@
 	nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
 
 !if ${INSTALLER_TYPE} == "OSGeo4W"
-	;IfFileExists "$INSTALL_DIR\etc\reboot" SetRebootFlag true
+	IfFileExists "$INSTALL_DIR\etc\reboot" RebootNecessary NoRebootNecessary
 
+RebootNecessary:
+	SetRebootFlag true
+
+NoRebootNecessary:
+
         Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
         CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
         "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"