Author: dreimer
Date: Thu Apr 30 21:46:34 2009
New Revision: 40756
URL: http://svn.reactos.org/svn/reactos?rev=40756&view=rev
Log:
Some cleanup and hopefully right understood line skips at the If blocks...
Modified:
trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi?rev=40756&r1=40755&r2=40756&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Thu Apr 30 21:46:34
2009
@@ -277,12 +277,12 @@
;;
;; Add our start menu shortcuts.
;;
- IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +12 0
+ IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +13 0
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
SetOutPath $REACTOS_SOURCE_DIRECTORY
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build
Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
- IfFileExists "$INSTDIR\RosBE.ps1" 0 +1
+ IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment -
Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit
&"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico"
SetOutPath $PROFILE
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build
Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"'
"$INSTDIR\mingw.ico"
@@ -300,10 +300,10 @@
;;
;; Add our desktop shortcuts.
;;
- IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +6 0
+ IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +7 0
SetOutPath $REACTOS_SOURCE_DIRECTORY
CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe"
'/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
- IfFileExists "$INSTDIR\RosBE.ps1" 0 +1
+ IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk"
"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"'
"$INSTDIR\rosbe.ico"
SetOutPath $PROFILE
CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico"
@@ -315,10 +315,10 @@
;;
;; Add our quick launch shortcuts.
;;
- IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +6 0
+ IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +7 0
SetOutPath $REACTOS_SOURCE_DIRECTORY
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
- IfFileExists "$INSTDIR\RosBE.ps1" 0 +1
+ IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk"
"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"'
"$INSTDIR\rosbe.ico"
SetOutPath $PROFILE
CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico"
@@ -343,31 +343,25 @@
"Are you sure you want to remove ReactOS Build Environment and all of
its components?" \
IDYES +2
Abort
- IfFileExists "$PROFILE\RosBE\." 0 +2
+ IfFileExists "$PROFILE\RosBE\." 0 +3
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
"Do you want to remove the ReactOS Build Environment configuration
file from the Profile Path?" \
IDNO +1
RMDir /r /REBOOTOK "$PROFILE\RosBE"
- IfFileExists "$APPDATA\RosBE\." 0 +2
+ IfFileExists "$APPDATA\RosBE\." 0 +3
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
"Do you want to remove the ReactOS Build Environment configuration
file from the Application Data Path?" \
IDNO +1
RMDir /r /REBOOTOK "$APPDATA\RosBE"
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 +12
- IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +1
- Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
- IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +1
- Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk"
- IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +1
- Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk"
- IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +1
- Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
- IfFileExists "$DESKTOP\ReactOS Build Environment - Powershell.lnk" 0 +1
- Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk"
- IfFileExists "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" 0 +1
- Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment -
Powershell.lnk"
+ IDNO +7
+ Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
+ Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk"
+ Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk"
+ Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
+ Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk"
+ Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk"
FunctionEnd
Section Uninstall
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi?rev=40756&r1=40755&r2=40756&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Thu Apr 30
21:46:34 2009
@@ -199,10 +199,8 @@
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 64-bit.lnk" 0 +2
- Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk"
- IfFileExists "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" 0 +2
- Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk"
+ Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk"
+ Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk"
;;
;; Clean up the registry.
