[Greater-commits] r3619 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-20 10:06:44 +0200 (Wed, 20 Jul 2011)
New Revision: 3619

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Cleanup temporary files during installation
do not print errors from db_setup to stdout


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-19 16:00:28 UTC (rev 3618)
+++ trunk/packaging/greater-installer.nsi	2011-07-20 08:06:44 UTC (rev 3619)
@@ -121,12 +121,16 @@
   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\defaultdb.backup" > "$TEMP\greater_insert.log" 2>&1'
   ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
-  "$TEMP\10_create_users.sql"'
+  "$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\90_grant_access.sql" >> "$TEMP\greater_insert.log" 2>&1'
 
+  Delete "$TEMP\defaultdb.backup"
+  Delete "$TEMP\10_create_users.sql"
+  Delete "$TEMP\90_grant_access.sql"
+
   ; Database should now be ready
 SectionEnd
 
@@ -152,7 +156,8 @@
   File "vcredist-80_x86.exe"
   ExecWait '$TEMP\vcredist_x86.exe /q' $0
   ExecWait '$TEMP\vcredist-80_x86.exe /q' $0
-
+  Delete "$TEMP\vcredist_x86.exe"
+  Delete "$TEMP\vcredist-80_x86.exe"
   ; Store installation folder
   WriteRegStr HKLM "Software\${productname_short}" "" $INSTDIR
   ; Create Registry keys