X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fbackupninja.in;h=5db2ff12ecf45cdb36a79ac60d62018011c8f5b8;hb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4;hp=31b8d1b10545c3147bafbf74f66f8de545fd0b3f;hpb=8386e304ff30df27e73d59fcae2a3ee3f03a9b70;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/src/backupninja.in b/src/backupninja.in
index 31b8d1b..5db2ff1 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -1,4 +1,6 @@
 #!@BASH@
+# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*-
+#
 #                          |\_
 # B A C K U P N I N J A   /()/
 #                         `\|
@@ -19,7 +21,7 @@
 #####################################################
 ## FUNCTIONS
 
-setupcolors () {
+function setupcolors () {
 	BLUE="\033[34;01m"
 	GREEN="\033[32;01m"
 	YELLOW="\033[33;01m"
@@ -27,18 +29,20 @@ setupcolors () {
 	RED="\033[31;01m"
 	OFF="\033[0m"
 	CYAN="\033[36;01m"
+	COLORS=($BLUE $GREEN $YELLOW $RED $PURPLE)
 }
 
-colorize () {
+function colorize () {
 	if [ "$usecolors" == "yes" ]; then
 		local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
-		[ "$typestr" == "Debug" ] && COLOR=$BLUE
-		[ "$typestr" == "Info" ] && COLOR=$GREEN
-		[ "$typestr" == "Warning" ] && COLOR=$YELLOW
-		[ "$typestr" == "Error" ] && COLOR=$RED
-		[ "$typestr" == "Fatal" ] && COLOR=$PURPLE
+		[ "$typestr" == "Debug" ] && type=0
+		[ "$typestr" == "Info" ] && type=1
+		[ "$typestr" == "Warning" ] && type=2
+		[ "$typestr" == "Error" ] && type=3
+		[ "$typestr" == "Fatal" ] && type=4
+		color=${COLORS[$type]}
 		endcolor=$OFF
-		echo -e "$COLOR$@$endcolor"
+		echo -e "$color$@$endcolor"
 	else
 		echo -e "$@"
 	fi
@@ -121,54 +125,6 @@ function msg {
 	let "msgcount += 1"
 }
 
-function setfile() {
-	CURRENT_CONF_FILE=$1
-}
-
-function setsection() {
-	CURRENT_SECTION=$1
-}
-
-
-#
-# 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
-# $2 is the default.
-# 
-
-function getconf() {
-	CURRENT_PARAM=$1
-	ret=`awk -f $scriptdir/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE`
-	# if nothing is returned, set the default
-	if [ "$ret" == "" -a "$2" != "" ]; then
-		ret="$2"
-	fi
-
-	# replace * with %, so that it is not globbed.
-	ret="${ret//\\*/__star__}"
-
-	# this is weird, but single quotes are needed to 
-	# allow for returned values with spaces. $ret is still expanded
-	# because it is in an 'eval' statement.
-	eval $1='$ret'
-}
-
 #
 # enforces very strict permissions on configuration file $file.
 #
@@ -194,7 +150,7 @@ function tolower() {
 
 # simple to integer function
 function toint() {
-	echo "$1" | tr [:alpha:] -d 
+	echo "$1" | tr -d [:alpha:] 
 }
 
 #
@@ -324,7 +280,7 @@ function process_action() {
 	echo "" > $bufferfile
 	echo_debug_msg=1
 	(
-		. $scriptdir/$suffix $file
+		. $scriptdirectory/$suffix $file
 	) 2>&1 | (
 		while read a; do
 			echo $a >> $bufferfile
@@ -424,21 +380,30 @@ if [ ! -r "$conffile" ]; then
 	fatal "Configuration file $conffile not found."
 fi
 
-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"
+# find $libdirectory
+libdirectory=`grep '^libdirectory' $conffile | awk '{print $3}'`
+if [ -z "$libdirectory" ]; then
+        if [ -d "@libdir@" ]; then
+	   libdirectory="@libdir@"
+	else
+	   echo "Could not find entry 'libdirectory' in $conffile." 
+	   fatal "Could not find entry 'libdirectory' in $conffile." 
+	fi
+else
+        if [ ! -d "$libdirectory" ]; then
+	   echo "Lib directory $libdirectory not found." 
+	   fatal "Lib directory $libdirectory not found." 
+	fi
 fi
 
-if [ ! -d "$scriptdir" ]; then
-	echo "Script directory $scriptdir not found." 
-	fatal "Script directory $scriptdir not found."
-fi
+# include shared functions
+. $libdirectory/tools
 
 setfile $conffile
 
 # get global config options (second param is the default)
 getconf configdirectory @CFGDIR@/backup.d
+getconf scriptdirectory @datadir@
 getconf reportemail
 getconf reportsuccess yes
 getconf reportwarning yes
@@ -470,7 +435,7 @@ fi
 [ -f "$logfile" ] || touch $logfile
 
 if [ "$UID" != "0" ]; then
-	echo "$0 can only be run as root"
+	echo "`basename $0` can only be run as root"
 	exit 1
 fi
 
@@ -508,7 +473,7 @@ for file in $files; do
 		continue
 	fi
 
-	if [ -e "$scriptdir/$suffix" ]; then
+	if [ -e "$scriptdirectory/$suffix" ]; then
 		process_action $file $suffix
 	else
 		error "Can't process file '$file': no handler script for suffix '$suffix'"