From 280fdac2bc2146a73282b47b2c7ce66c19a0d3f2 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Nov 2005 10:08:41 +0000
Subject:  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.

---
 src/Makefile.in    |  4 ++--
 src/ninjahelper.in | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.in b/src/Makefile.in
index 8a67513..912026e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
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!"
-- 
cgit v1.2.3