X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=lib%2Ftools.in;h=929826b2eacb252213abce10c2d553ed6b971c71;hp=2ec4da05c213df7b832006cdc6cebcc0d69cd27f;hb=78884142e7cdaaf3e1f5571b1f28d2ea5a520b30;hpb=66d619bf64dec4c7472b5d4c09a964f5027fadb4

diff --git a/lib/tools.in b/lib/tools.in
index 2ec4da0..929826b 100644
--- a/lib/tools.in
+++ b/lib/tools.in
@@ -1,5 +1,6 @@
 #!@BASH@
 # -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+# vim: set filetype=sh sw=3 sts=3 expandtab autoindent:
 
 # This file contains functions shared between ninjahelper and backupninja.
 
@@ -10,46 +11,39 @@
 # 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
+   local tempfile=`mktemp /tmp/$1.XXXXXXXX`
+   echo $tempfile
 }
 
 #####################################################
 ## CONFIG-FILE RELATED FUNCTIONS
 
 function setfile() {
-	CURRENT_CONF_FILE=$1
+   CURRENT_CONF_FILE=$1
 }
 
 function setsection() {
-	CURRENT_SECTION=$1
+   CURRENT_SECTION=$1
 }
 
 #
 # 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 $libdirectory/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'
+   CURRENT_PARAM=$1
+   ret=`@AWK@ -f $libdirectory/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'
 }