r3555@krups: intrigeri | 2005-11-15 13:59:57 +0100

 Moved easydialog.sh to lib/ directory: more code is going to be shared, let's start here.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 0f5af82..7497b69 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -196,6 +196,15 @@ if [ ! -d "$scriptdir" ]; then
 	echo "Script directory $scriptdir not found." 
 	exit 1
 fi
+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
+fi
 configdirectory=`grep configdirectory $conffile | awk '{print $3}'`
 if [ ! -n "$configdirectory" ]; then
 	echo "Cound not find entry 'configdirectory' in $conffile" 
@@ -206,7 +215,7 @@ if [ ! -d "$configdirectory" ]; then
 	exit 1
 fi
 
-. $scriptdir/easydialog.sh
+. $libdir/easydialog.sh
 
 if [ "$UID" != "0" ]; then
 	msgBox "warning" "ninjahelper must be run by root!"