From 437b3280be6ff0eed44ee160e4708f483a688a94 Mon Sep 17 00:00:00 2001
From: Dan Langille <dan@langille.org>
Date: Mon, 21 Feb 2005 00:09:38 +0000
Subject: [PATCH] =?utf8?q?Add=20patches=20from=20Roger=20H=C3=A5kansson=20?=
 =?utf8?q?<hson=20<at>=20ludd.luth.se>=20Improve=20the=20scripts=20so=20th?=
 =?utf8?q?ey=20work=20in=20a=20wider=20range=20of=20conditions.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1836 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/create_postgresql_database.in  | 2 +-
 bacula/src/cats/drop_postgresql_tables.in      | 3 +--
 bacula/src/cats/grant_postgresql_privileges.in | 2 +-
 bacula/src/cats/make_postgresql_tables.in      | 2 +-
 bacula/src/cats/update_postgresql_tables.in    | 3 +--
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
index 5ec7a8f7e9..1cbe61e9e6 100644
--- a/bacula/src/cats/create_postgresql_database.in
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -5,7 +5,7 @@
 
 bindir=@SQL_BINDIR@
 
-if $bindir/psql template1 $* -f - <<END-OF-DATA
+if $bindir/psql -f - -d template1 $* <<END-OF-DATA
 CREATE DATABASE bacula;
 END-OF-DATA
 then
diff --git a/bacula/src/cats/drop_postgresql_tables.in b/bacula/src/cats/drop_postgresql_tables.in
index 35ec377845..ad3ec4a935 100644
--- a/bacula/src/cats/drop_postgresql_tables.in
+++ b/bacula/src/cats/drop_postgresql_tables.in
@@ -4,8 +4,7 @@
 
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
+if $bindir/psql -f - -d bacula $* <<END-OF-DATA
 drop table unsavedfiles;
 drop table basefiles;
 drop table jobmedia;
diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index 02c18fb8e5..552232a7dd 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -5,7 +5,7 @@
 USER=bacula
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* bacula -f - <<END-OF-DATA
+if $bindir/psql -f - -d bacula $* <<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 97ab280633..b1e759bb2c 100644
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -4,7 +4,7 @@
 #
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* bacula -f - <<END-OF-DATA
+if $bindir/psql -f - -d bacula $* <<END-OF-DATA
 
 CREATE TABLE filename
 (
diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index c8e7eec632..109700161a 100755
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -9,8 +9,7 @@ echo "this script may take several minutes to run."
 echo " "
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
+if $bindir/psql -f - -d bacula $* <<END-OF-DATA
 
 ALTER TABLE media ADD COLUMN labeltype integer;
 UPDATE media SET labeltype=0;
-- 
2.39.5