Author: dreimer
Date: Tue Apr 21 01:51:39 2009
New Revision: 40616
URL: http://svn.reactos.org/svn/reactos?rev=40616&view=rev
Log:
Finish the changes to make if possible to keep the settings on a update.
Modified:
trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi?rev=40616&r1=40615&r2=40616&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Apr 21 01:51:39
2009
@@ -276,6 +276,7 @@
;;
;; Add our start menu shortcuts.
;;
+ IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +10 0
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
SetOutPath $REACTOS_SOURCE_DIRECTORY
@@ -296,6 +297,7 @@
;;
;; Add our desktop shortcuts.
;;
+ IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +4 0
SetOutPath $REACTOS_SOURCE_DIRECTORY
CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe"
'/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
SetOutPath $PROFILE
@@ -308,6 +310,7 @@
;;
;; Add our quick launch shortcuts.
;;
+ IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +4 0
SetOutPath $REACTOS_SOURCE_DIRECTORY
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
SetOutPath $PROFILE
@@ -335,17 +338,25 @@
Abort
IfFileExists "$PROFILE\RosBE\." 0 +2
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
- "Are you sure you want to remove the ReactOS Build Environment
configuration file from the Profile Path?" \
- IDYES +2
+ "Do you want to remove the ReactOS Build Environment configuration
file from the Profile Path?" \
+ IDNO +1
RMDir /r /REBOOTOK "$PROFILE\RosBE"
- Abort
IfFileExists "$APPDATA\RosBE\." 0 +2
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
- "Are you sure you want to remove the ReactOS Build Environment
configuration file from the Application Data Path?" \
- IDYES +2
+ "Do you want to remove the ReactOS Build Environment configuration
file from the Application Data Path?" \
+ IDNO +1
RMDir /r /REBOOTOK "$APPDATA\RosBE"
-
- Abort
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
+ "Do you want to remove the Shortcuts? If you just want to Update to a new
Version of RosBE, keep them. This keeps your previous settings." \
+ IDNO +8
+ IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2
+ Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
+ IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2
+ Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk"
+ IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2
+ Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk"
+ IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2
+ Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
FunctionEnd
Section Uninstall
@@ -400,14 +411,6 @@
Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR"
will be KILLED!!!
RMDir /REBOOTOK "$INSTDIR"
- IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2
- Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
- IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2
- Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk"
- IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2
- Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk"
- IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2
- Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
;;
;; Clean up the registry.
