[Greater-commits] r3627 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-20 17:05:25 +0200 (Wed, 20 Jul 2011)
New Revision: 3627

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Use execdos to hide db import
- Fix postgres uninstaller call


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-20 14:23:09 UTC (rev 3626)
+++ trunk/packaging/greater-installer.nsi	2011-07-20 15:05:25 UTC (rev 3627)
@@ -23,6 +23,8 @@
   ; Modern UI
   !include "MUI.nsh"
 
+  ; Add (custom) plugin dir
+  !addplugindir plugins
 ;--------------------------------
 ; Variable declarations
   Var POSTGRESQL_INSTALLED
@@ -120,12 +122,12 @@
   File "defaultdata\10_create_users.sql"
   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'
-  ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
-  "$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'
+  ExecDos::exec '"$INSTDIR\postgres9\bin\pg_restore.exe" -C -O -d postgres -U greater \
+  "$TEMP\defaultdb.backup"' "" "$TEMP\greater_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
+  "$TEMP\10_create_users.sql"' "" "$TEMP\greater_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
+  "$TEMP\90_grant_access.sql"' "" "$TEMP\greater_insert.log"
 
   Delete "$TEMP\defaultdb.backup"
   Delete "$TEMP\10_create_users.sql"
@@ -381,7 +383,7 @@
 Section "un.PostgreSQL" UnSecPostgreSQL
    Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
    ; TODO find path from registry and uninstall
-   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe --mode unattended"'
+   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe" --mode unattended'
    Banner::destroy 
    RMDIR "$INSTDIR\postgres9"
    RMDIR "$INSTDIR"
@@ -402,7 +404,8 @@
    Banner::destroy 
 SectionEnd
 
-Section "un.-uninstall"
+Section "un."
+
   !include ${client-un}
   !include ${admin-un}
   ; Delete Registry keys