X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fbackupninja.in;h=26634576c1b4655650d1963b5ce658378a981104;hb=285f38ac3154898fcc63d21a1eace97c851356d5;hp=55a3d00410371ff452ebabb31ba661aef7595915;hpb=960acb6b0c4cbef60ba72f2c637dc543ae2a85c5;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/src/backupninja.in b/src/backupninja.in
index 55a3d00..2663457 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -19,7 +19,7 @@
 #####################################################
 ## FUNCTIONS
 
-function setupcolors() {
+setupcolors () {
 	BLUE="\033[34;01m"
 	GREEN="\033[32;01m"
 	YELLOW="\033[33;01m"
@@ -27,20 +27,18 @@ function setupcolors() {
 	RED="\033[31;01m"
 	OFF="\033[0m"
 	CYAN="\033[36;01m"
-	COLORS=($BLUE $GREEN $YELLOW $RED $PURPLE)
 }
 
-function colorize() {
+colorize () {
 	if [ "$usecolors" == "yes" ]; then
 		local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
-		[ "$typestr" == "Debug" ] && type=0
-		[ "$typestr" == "Info" ] && type=1
-		[ "$typestr" == "Warning" ] && type=2
-		[ "$typestr" == "Error" ] && type=3
-		[ "$typestr" == "Fatal" ] && type=4
-		color=${COLORS[$type]}
+		[ "$typestr" == "Debug" ] && COLOR=$BLUE
+		[ "$typestr" == "Info" ] && COLOR=$GREEN
+		[ "$typestr" == "Warning" ] && COLOR=$YELLOW
+		[ "$typestr" == "Error" ] && COLOR=$RED
+		[ "$typestr" == "Fatal" ] && COLOR=$PURPLE
 		endcolor=$OFF
-		echo -e "$color$@$endcolor"
+		echo -e "$COLOR$@$endcolor"
 	else
 		echo -e "$@"
 	fi
@@ -50,8 +48,8 @@ function colorize() {
 # 0 - debug - blue
 # 1 - normal messages - green
 # 2 - warnings - yellow
-# 3 - errors - orange
-# 4 - fatal - red
+# 3 - errors - red
+# 4 - fatal - purple
 # First variable passed is the error level, all others are printed
 
 # if 1, echo out all warnings, errors, or fatal
@@ -132,22 +130,6 @@ function setsection() {
 }
 
 
-#
-# create a temporary file in a secure way.
-#
-function maketemp() {
-	if [ -x /bin/mktemp ]
-	then
-		local tempfile=`mktemp /tmp/$1.XXXXXXXX`
-	else
-		DATE=`date`
-		sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
-		local tempfile=/tmp/$1.$sectmp
-	fi
-	echo $tempfile
-}
-
-
 #
 # sets a global var with name equal to $1
 # to the value of the configuration parameter $1
@@ -426,15 +408,36 @@ if [ ! -r "$conffile" ]; then
 	fatal "Configuration file $conffile not found."
 fi
 
+# find $scriptdir
 scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$scriptdir" ]; then
-	echo "Cound not find entry 'scriptdirectory' in $conffile" 
-	fatal "Cound not find entry 'scriptdirectory' in $conffile"
+if [ -z "$scriptdir" ]; then
+        if [ -d "@datadir@" ]; then
+	   scriptdir="@datadir@"
+	else
+	   echo "Could not find entry 'scriptdirectory' in $conffile" 
+	   fatal "Could not find entry 'scriptdirectory' in $conffile" 
+	fi
+else
+        if [ ! -d "$scriptdir" ]; then
+	   echo "Script directory $scriptdir not found."
+	   fatal "Script directory $scriptdir not found."
+	fi	   
 fi
 
-if [ ! -d "$scriptdir" ]; then
-	echo "Script directory $scriptdir not found." 
-	fatal "Script directory $scriptdir not found."
+# find $libdir
+libdir=`grep libdirectory $conffile | awk '{print $3}'`
+if [ -z "$libdir" ]; then
+        if [ -d "@libdir@" ]; then
+	   libdir="@libdir@"
+	else
+	   echo "Could not find entry 'libdirectory' in $conffile." 
+	   fatal "Could not find entry 'libdirectory' in $conffile." 
+	fi
+else
+        if [ ! -d "$libdir" ]; then
+	   echo "Lib directory $libdir not found." 
+	   fatal "Lib directory $libdir not found." 
+	fi
 fi
 
 setfile $conffile
@@ -469,6 +472,9 @@ if [ ! -d "$configdirectory" ]; then
 	fatal "Configuration directory '$configdirectory' not found."
 fi
 
+# include shared functions
+. $libdir/tools
+
 [ -f "$logfile" ] || touch $logfile
 
 if [ "$UID" != "0" ]; then