X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=src%2Fninjahelper.in;h=451f38978e91b56a959d89491e1bcd199b9c199a;hp=7497b69e6337714d5f618ddb1dba3736db3d0ab5;hb=13893e6d255a0b3ff1ac2ffb74cff0652d2b61f4;hpb=280fdac2bc2146a73282b47b2c7ce66c19a0d3f2

diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 7497b69..451f389 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH@
 
 ####################################################
 ## Functions
@@ -187,24 +187,39 @@ if [ ! -r "$conffile" ]; then
 	echo "Configuration file $conffile not found." 
 	exit 1
 fi
+
+# find $scriptdir
 scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$scriptdir" ]; then
-	echo "Cound not find entry 'scriptdirectory' in $conffile" 
-	exit 1
-fi
-if [ ! -d "$scriptdir" ]; then
-	echo "Script directory $scriptdir not found." 
-	exit 1
+if [ -z "$scriptdir" ]; then
+        if [ -d "@datadir@" ]; then
+	   scriptdir="@datadir@"
+	else
+	   echo "Could not find entry 'scriptdirectory' in $conffile" 
+	   exit 1
+	fi
+else
+        if [ ! -d "$scriptdir" ]; then
+	   echo "Script directory $scriptdir not found." 
+	   exit 1
+	fi	   
 fi
+
+# find $libdir
 libdir=`grep libdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$libdir" ]; then
-	echo "Cound not find entry 'libdirectory' in $conffile" 
-	exit 1
-fi
-if [ ! -d "$libdir" ]; then
-	echo "Script directory $libdir not found." 
-	exit 1
+if [ -z "$libdir" ]; then
+        if [ -d "@libdir@" ]; then
+	   libdir="@libdir@"
+	else
+	   echo "Could not find entry 'libdirectory' in $conffile." 
+	   exit 1
+	fi
+else
+        if [ ! -d "$libdir" ]; then
+	   echo "Lib directory $libdir not found." 
+	   exit 1
+	fi
 fi
+
 configdirectory=`grep configdirectory $conffile | awk '{print $3}'`
 if [ ! -n "$configdirectory" ]; then
 	echo "Cound not find entry 'configdirectory' in $conffile" 
@@ -215,7 +230,7 @@ if [ ! -d "$configdirectory" ]; then
 	exit 1
 fi
 
-. $libdir/easydialog.sh
+. $libdir/easydialog
 
 if [ "$UID" != "0" ]; then
 	msgBox "warning" "ninjahelper must be run by root!"