Use @scriptdir@ not . ./

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

diff --git a/bacula/src/cats/create_bacula_database.in b/bacula/src/cats/create_bacula_database.in
index 36be4582b0da0c79c03b5423d14cfe141a249a96..468e9c7a0d16b71881b1598f92dda14b0f2b0519 100644 (file)
--- a/bacula/src/cats/create_bacula_database.in
+++ b/bacula/src/cats/create_bacula_database.in
@@ -5,13 +5,13 @@
 #
 if test xsqlite = x@DB_NAME@ ; then
   echo "Creating SQLite database"
-  . ./create_sqlite_database
+  @scriptdir@/create_sqlite_database
 else
   if test xmysql = x@DB_NAME@ ; then
     echo "Creating MySQL database"
-    . ./create_mysql_database
+    @scriptdir@/create_mysql_database
   else
     echo "Creating PostgreSQL database"
-    . ./create_postgresql_database
+    @scriptdir@/create_postgresql_database
   fi
 fi

diff --git a/bacula/src/cats/drop_bacula_tables.in b/bacula/src/cats/drop_bacula_tables.in
index 2a1d2e62f74c4bc8ca326b5c4675a99b4c6dee90..270608c0dda517d72b558938ee65c06f9417ae31 100755 (executable)
--- a/bacula/src/cats/drop_bacula_tables.in
+++ b/bacula/src/cats/drop_bacula_tables.in
@@ -4,16 +4,16 @@
 #    MySQL or SQLite
 #
 if test xsqlite = x@DB_NAME@ ; then
-  . ./drop_sqlite_tables
+  @scriptdir@/drop_sqlite_tables
   echo "Dropped SQLite tables"
 else
   if test xmysql = x@DB_NAME@ ; then 
     echo "Making MySQL tables"
-    . ./drop_mysql_tables
+    @scriptdir@/drop_mysql_tables
     echo "Dropped MySQL tables"
   else
     # hardcoded database name - should be a parameter
-    . ./drop_postgresql_tables bacula
+    @scriptdir@/drop_postgresql_tables bacula
     echo "Dropped PostgreSQL tables"
   fi
 fi

diff --git a/bacula/src/cats/grant_bacula_privileges.in b/bacula/src/cats/grant_bacula_privileges.in
index 201de272c5c7bedf85bd4786798bab88d771f240..f8f7b3d0ca87be7598cc0eaa41e1383de75cabce 100755 (executable)
--- a/bacula/src/cats/grant_bacula_privileges.in
+++ b/bacula/src/cats/grant_bacula_privileges.in
@@ -6,17 +6,17 @@
 #
 if test xmysql = x@DB_NAME@ ; then 
   echo "Granting MySQL privileges"
-  . ./grant_mysql_privileges
+  @scriptdir@/grant_mysql_privileges
 else
   if test xpostgresql = x@DB_NAME@ ; then 
     echo "Granting PostgreSQL privileges"
     # hard coded database name
-    . ./grant_postgresql_privileges bacula
+    @scriptdir@/grant_postgresql_privileges bacula
   else
     if test xsqlite = x@DB_NAME@ ; then 
       echo "Granting SQLite privileges"
       # hard coded database name
-      . ./grant_sqlite_privileges
+      @scriptdir@/grant_sqlite_privileges
     fi
   fi
 fi

diff --git a/bacula/src/cats/make_bacula_tables.in b/bacula/src/cats/make_bacula_tables.in
index a40d886cf9f664582611e45bbee883511c8b9cb3..58cab959f543763b00c67f27ccbcb4902e5061cb 100755 (executable)
--- a/bacula/src/cats/make_bacula_tables.in
+++ b/bacula/src/cats/make_bacula_tables.in
@@ -5,14 +5,14 @@
 #
 if test xsqlite = x@DB_NAME@ ; then
   echo "Making SQLite tables"
-  . ./make_sqlite_tables
+  @scriptdir@/make_sqlite_tables
 else
   if test xmysql = x@DB_NAME@ ; then 
     echo "Making MySQL tables"
-    . ./make_mysql_tables
+    @scriptdir@/make_mysql_tables
   else
     echo "Making PostgreSQL tables"
     # hard coded database name
-    . ./make_postgresql_tables bacula
+    @scriptdir@/make_postgresql_tables bacula
   fi
 fi

diff --git a/bacula/src/cats/update_bacula_tables.in b/bacula/src/cats/update_bacula_tables.in
index a45d69eaa28bd54e32fdefd2832080ddc021f32e..500287136393d04e7bdf003c2a846c4183ea6a9c 100755 (executable)
--- a/bacula/src/cats/update_bacula_tables.in
+++ b/bacula/src/cats/update_bacula_tables.in
@@ -5,14 +5,14 @@
 #
 if test xsqlite = x@DB_NAME@ ; then
   echo "Altering SQLite tables"
-  . ./update_sqlite_tables
+  @scriptdir@/update_sqlite_tables
 fi
 if test xmysql = x@DB_NAME@ ; then
   echo "Altering MySQL tables"
-  . ./update_mysql_tables
+  @scriptdir@/update_mysql_tables
 fi
 if test xpostgresql = x@DB_NAME@ ; then
   echo "Altering PostgreSQL tables"
   # we need the bacula datbase name in here... Should not be hardcoded
-  . ./update_postgresql_tables bacula
+  @scriptdir@/update_postgresql_tables bacula
 fi