From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 4 Nov 2008 13:56:46 +0000 (+0000)
Subject: ebl  Turn to sh instead of bash
X-Git-Tag: Release-7.0.0~3798
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8c0330b4c4819232bd6523ff726c9be0faab033a;p=bacula%2Fbacula

ebl  Turn to sh instead of bash


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

diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in
index bb53b46a94..d73fa3805e 100644
--- a/bacula/src/cats/grant_mysql_privileges.in
+++ b/bacula/src/cats/grant_mysql_privileges.in
@@ -2,9 +2,9 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user-@db_user@}
+db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_name=${db_name:-@db_name@}
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index e441ec3c64..5532dbe9a2 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -2,9 +2,9 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user-@db_user@}
+db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_name=${db_name:-@db_name@}
 
 if $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 6535ae3124..7fdea045c6 100644
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -3,7 +3,7 @@
 # shell script to create Bacula MySQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_name=${db_name:-@db_name@}
 
 if $bindir/mysql $* -f <<END-OF-DATA
 USE ${db_name};
diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index 45502175a4..324300df69 100644
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -3,7 +3,7 @@
 # shell script to create Bacula PostgreSQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_name=${db_name:-@db_name@}
 
 $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 7be49a1ff7..8890336468 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,8 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+04Nov08
+ebl  Fix bash shell to sh shell in database creation script
 02Nov08
 kes  Fix orphaned jobs (possible deadlock) while pruning.
 kes  Use jcr stored in bsock rather than searching in getmsg.c.