[Greater-commits] r409 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-12 15:12:45 +0200 (Tue, 12 Jul 2011)
New Revision: 409

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Do not set the postgres serverport to non default value
Do not restore the owener setting
Correctly use psql with -f option


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-12 12:44:44 UTC (rev 408)
+++ trunk/packaging/greater-installer.nsi	2011-07-12 13:12:45 UTC (rev 409)
@@ -104,7 +104,7 @@
   ExecWait '"$TEMP\postgresql-9.0.4-1-windows.exe" --mode unattended --prefix "$INSTDIR\postgres9" \
   --superpassword greater --superaccount greater \
   --serviceaccount greater-db --servicepassword greater \
-  --serverport 8890 --datadir "$INSTDIR\GREAT-ER-DB\database" --create_shortcuts 0 \
+  --datadir "$INSTDIR\GREAT-ER-DB\database" --create_shortcuts 0 \
   --servicename greater_postgres_server' $0
   Delete "$TEMP\postgresql-9.0.4-1-windows.exe"
   banner::destroy
@@ -118,11 +118,11 @@
   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 -d postgres -U greater \
+  ExecWait '"$INSTDIR\postgres9\bin\pg_restore.exe" -C -O -d postgres -U greater \
   "$TEMP\defaultdb.backup"'
-  ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater \
+  ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
   "$TEMP\10_create_users.sql"'
-  ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater \
+  ExecWait '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
   "$TEMP\90_grant_access.sql"'
 
   ; Database should now be ready