r3559@krups: intrigeri | 2005-11-15 15:07:17 +0100

[matthijs/upstream/backupninja.git] / src / backupninja.in

diff --git a/src/backupninja.in b/src/backupninja.in
index 31b8d1b10545c3147bafbf74f66f8de545fd0b3f..8f7bd03f39542a1e537cb4e13fcb4850978e5a22 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -424,15 +424,36 @@ if [ ! -r "$conffile" ]; then
        fatal "Configuration file $conffile not found."
 fi
 
+# find $scriptdir
 scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$scriptdir" ]; then
-       echo "Cound not find entry 'scriptdirectory' in $conffile" 
-       fatal "Cound not find entry 'scriptdirectory' in $conffile"
+if [ -z "$scriptdir" ]; then
+        if [ -d "@datadir@" ]; then
+          scriptdir="@datadir@"
+       else
+          echo "Could not find entry 'scriptdirectory' in $conffile" 
+          fatal "Could not find entry 'scriptdirectory' in $conffile" 
+       fi
+else
+        if [ ! -d "$scriptdir" ]; then
+          echo "Script directory $scriptdir not found."
+          fatal "Script directory $scriptdir not found."
+       fi         
 fi
 
-if [ ! -d "$scriptdir" ]; then
-       echo "Script directory $scriptdir not found." 
-       fatal "Script directory $scriptdir not found."
+# find $libdir
+libdir=`grep libdirectory $conffile | awk '{print $3}'`
+if [ -z "$libdir" ]; then
+        if [ -d "@libdir@" ]; then
+          libdir="@libdir@"
+       else
+          echo "Could not find entry 'libdirectory' in $conffile." 
+          fatal "Could not find entry 'libdirectory' in $conffile." 
+       fi
+else
+        if [ ! -d "$libdir" ]; then
+          echo "Lib directory $libdir not found." 
+          fatal "Lib directory $libdir not found." 
+       fi
 fi
 
 setfile $conffile