Move the database name to the command line rather than embedded in the

coammnds.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1392 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index fc69abd1f11d1bfa366487ada2b5b6d091b465ba..1a3b9dbb04ddbbec43e7bb30ea9b30aba1b3a8c8 100644 (file)
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -5,8 +5,7 @@
 USER=bacula
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
+if $bindir/psql $* bacula -f - <<END-OF-DATA
 
 create user ${USER};
 

diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index 9f7131c48d608f56d0f442c04163246cc433a877..f5ec9cdbb0866404ece807f401315b21fea5cee1 100644 (file)
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -4,8 +4,7 @@
 #
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
+if $bindir/psql $* bacula -f - <<END-OF-DATA
 
 create table version
 (