[Greater-commits] r3625 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-20 16:20:37 +0200 (Wed, 20 Jul 2011)
New Revision: 3625

Modified:
   trunk/packaging/greater-installer.nsi
Log:
- Delete python installer after installation
- Do not log into files with postgres installation
- Uninstall postgres unattended


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-20 13:25:56 UTC (rev 3624)
+++ trunk/packaging/greater-installer.nsi	2011-07-20 14:20:37 UTC (rev 3625)
@@ -121,11 +121,11 @@
   File "defaultdata\90_grant_access.sql"
   DetailPrint "Creating default GREAT-ER datasets"
   ExecWait '"$INSTDIR\postgres9\bin\pg_restore.exe" -C -O -d postgres -U greater \
-  "$TEMP\defaultdb.backup" > "$TEMP\greater_insert.log" 2>&1'
+  "$TEMP\defaultdb.backup"'# > "$TEMP\greater_insert.log" 2>&1'
   ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
-  "$TEMP\10_create_users.sql" >> "$TEMP\greater_insert.log" 2>&1'
+  "$TEMP\10_create_users.sql"'# >> "$TEMP\greater_insert.log" 2>&1'
   ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
-  "$TEMP\90_grant_access.sql" >> "$TEMP\greater_insert.log" 2>&1'
+  "$TEMP\90_grant_access.sql"'# >> "$TEMP\greater_insert.log" 2>&1'
 
   Delete "$TEMP\defaultdb.backup"
   Delete "$TEMP\10_create_users.sql"
@@ -140,7 +140,7 @@
   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
-  Delete "$TEMP\python-2.7.2-msi"
+  Delete "$TEMP\python-2.7.2.msi"
   banner::destroy
 SectionEnd
 
@@ -379,10 +379,9 @@
 ;Uninstaller
 
 Section "un.PostgreSQL" UnSecPostgreSQL
-  uninstallPostgreSQL:
    Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
    ; TODO find path from registry and uninstall
-   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe"'
+   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe --mode unattended"'
    Banner::destroy 
    RMDIR "$INSTDIR\postgres9"
    RMDIR "$INSTDIR"
@@ -397,13 +396,13 @@
 Section "un.Python"
    Banner::show /NOUNLOAD /set 76 "Uninstalling Python..."
    SetOutPath "$TEMP" 
-   File "python-2.7.2.msi"
+   File "$TEMP\python-2.7.2.msi"
    ExecWait '"msiexec" /uninstall $TEMP\python-2.7.2.msi'
+   Delete "$TEMP\python-2.7.2.msi"
    Banner::destroy 
-   RMDIR "$INSTDIR"
 SectionEnd
 
-Section "un."
+Section "un.-uninstall"
   !include ${client-un}
   !include ${admin-un}
   ; Delete Registry keys