[ros-diffs] [dreimer] 36615: Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force a unistallation to continue setup.

Author: dreimer
Date: Wed Oct  1 13:02:19 2008
New Revision: 36615

URL: http://svn.reactos.org/svn/reactos?rev=36615&view=rev
Log:
Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force
a unistallation to continue setup.

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.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Oct  1 13:02:19 2008
@@ -398,8 +398,7 @@
                "DisplayVersion"
     ${If} $R1 == "${PRODUCT_VERSION}"
         messageBox MB_OK|MB_ICONEXCLAMATION \
-            "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed.
Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to
reinstall."
-        Quit
+            "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You
should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall."
     ${EndIf}
     ${If} $R0 == ""
         ReadRegStr $R0 HKLM \
@@ -413,18 +412,17 @@
         ${EndIf}
     ${EndIf}
     MessageBox MB_YESNO|MB_ICONQUESTION  \
-               "A previous version of the ${PRODUCT_NAME} was found. You must
uninstall it before installing this version.$\n$\nDo you want to do that now?" \
+               "A previous version of the ${PRODUCT_NAME} was found. You should
uninstall it before installing this version.$\n$\nDo you want to do that now?" \
                IDNO UninstallPrevious_no \
                IDYES UninstallPrevious_yes
     Abort
-    UninstallPrevious_no:
-        Quit
     UninstallPrevious_yes:
         Var /global PREVIOUSINSTDIR
         Push $R0
         Call GetParent
         Pop $PREVIOUSINSTDIR
         ExecWait '$R0 _?=$PREVIOUSINSTDIR'
+    UninstallPrevious_no:
 FunctionEnd
 
 Function GetParent

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct  1 13:02:19 2008
@@ -212,8 +212,7 @@
                "DisplayVersion"
     ${If} $R1 == "${PRODUCT_VERSION}"
         messageBox MB_OK|MB_ICONEXCLAMATION \
-            "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed.
Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to
reinstall."
-        Quit
+            "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You
should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall."
     ${EndIf}
     ${If} $R0 == ""
         ReadRegStr $R0 HKLM \
@@ -227,18 +226,17 @@
         ${EndIf}
     ${EndIf}
     MessageBox MB_YESNO|MB_ICONQUESTION  \
-               "A previous version of the ${PRODUCT_NAME} was found. You must
uninstall it before installing this version.$\n$\nDo you want to do that now?" \
+               "A previous version of the ${PRODUCT_NAME} was found. You should
uninstall it before installing this version.$\n$\nDo you want to do that now?" \
                IDNO UninstallPrevious_no \
                IDYES UninstallPrevious_yes
     Abort
-    UninstallPrevious_no:
-        Quit
     UninstallPrevious_yes:
         Var /global PREVIOUSINSTDIR
         Push $R0
         Call GetParent
         Pop $PREVIOUSINSTDIR
         ExecWait '$R0 _?=$PREVIOUSINSTDIR'
+    UninstallPrevious_no:
 FunctionEnd
 
 Function GetParent