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 bb53b46a94e8baa90c6ed996cf8442e6d78bb9bf..d73fa3805e6b5415020e1b8bfba416c426a3f14c 100644 (file)
--- 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 e441ec3c646a2770ff54ec767ac4c3af1a6d0b98..5532dbe9a215c4b32b3f6a4409a8de78eae3d693 100644 (file)
--- 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 6535ae3124e8e584e9805b45bf468ddb1ca6e76b..7fdea045c6b58f67a125e0ebadb199796d54057e 100644 (file)
--- 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 45502175a4eebaf21a52cb75c7cf411f24ce0fcc..324300df691a592f608b3216efa64e77ea10c2a0 100644 (file)
--- 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 7be49a1ff7aad6e16b42a48ae265fbfb5c98394a..889033646881d8ffc6963d8f0e9f2fd781a0edc8 100644 (file)
--- 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.