projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3558@krups: intrigeri | 2005-11-15 14:44:17 +0100
[matthijs/upstream/backupninja-vserver.git]
/
src
/
ninjahelper.in
diff --git
a/src/ninjahelper.in
b/src/ninjahelper.in
index 0f5af82ebea5978079af72868858db566a66f989..f0ad45a9685cc6d28fbafe883fefcaf35cee2638 100755
(executable)
--- 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
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"
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
exit 1
fi
-. $
scriptdir/easydialog.sh
+. $
libdir/easydialog
if [ "$UID" != "0" ]; then
msgBox "warning" "ninjahelper must be run by root!"
if [ "$UID" != "0" ]; then
msgBox "warning" "ninjahelper must be run by root!"