[Greater-commits] r3631 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-21 18:02:42 +0200 (Thu, 21 Jul 2011)
New Revision: 3631

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Make it possible to overwrite an exisiting installation

Fix an Installation Issue on English Systems where python
installation would abort because of the space in PROGRAM FILES


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-21 09:01:39 UTC (rev 3630)
+++ trunk/packaging/greater-installer.nsi	2011-07-21 16:02:42 UTC (rev 3631)
@@ -141,7 +141,7 @@
   SetOutPath "$TEMP"
   File "python-2.7.2.msi" ; Should be more generalized
   DetailPrint "Installing Python..."
-  ExecWait '"msiexec" /i $TEMP\python-2.7.2.msi /quiet TARGETDIR=$INSTDIR\Python2.7' $0
+  ExecWait '"msiexec" /i $TEMP\python-2.7.2.msi /quiet TARGETDIR="$INSTDIR\Python2.7"' $0
   Delete "$TEMP\python-2.7.2.msi"
   banner::destroy
 SectionEnd
@@ -295,9 +295,9 @@
   IfErrors leave 0
     MessageBox MB_YESNO|MB_ICONEXCLAMATION "${productname_short} \
     $(T_AlreadyInstalled)" IDYES leave
-    Abort
   leave:
     ExecWait '$0 _?=$INSTDIR'
+  overwrite:
 FunctionEnd
 
 # PrintNonAdminWarning
@@ -479,8 +479,10 @@
 # From Function CheckExistingVersion
 LangString T_AlreadyInstalled ${LANG_ENGLISH} \
     "has already been installed.$\r$\nDo you want to \
-    uninstall it and continue the installation of:$\r$\n\
-    ${productname_short} ${version_date}?"
+    it is recommended that you uninstall
+    if before continuing the installation of:$\r$\n\
+    ${productname_short} ${version_date} $\r$\n\
+    Do you want to uninstall the old Version of ${productname_short} ?"
 # From Custom Welcome Page
 #
 # Title