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

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

diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 104575944d4a376aae9e5ac9d54d800d2ce2221d..7497b69e6337714d5f618ddb1dba3736db3d0ab5 100755 (executable)
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -23,7 +23,7 @@ function check_perms() {
 ##
 ## returns the next available file name given a file
 ## in the form @CFGDIR@/backup.d/10.sys
-## sets variable $returned_filename
+## sets variable $next_filename
 ##
 get_next_filename() {
   next_filename=$1
@@ -41,7 +41,7 @@ get_next_filename() {
 ## installs packages (passed in as $@) if not present
 ##
 require_packages() {
-       for pkg in "$@"; do
+       for pkg in "$@"; do
           installed=`dpkg -s $pkg | grep 'ok installed'`
        if [ -z "$installed" ]; then 
            booleanBox "install $pkg?" "This backup action requires package $pkg. Do you want to install it now?"
@@ -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!"