aboutsummaryrefslogtreecommitdiff
path: root/lib/tools.in
diff options
context:
space:
mode:
authorMatthijs Kooijman <matthijs@stdin.nl>2009-05-22 14:50:52 +0200
committerMatthijs Kooijman <matthijs@stdin.nl>2009-05-23 10:34:16 +0200
commit4ecaae94054c4eb919ddbd45904d834383a09558 (patch)
treedd27a8ee9dd7882f78b9cbf1b20ec51d9cf8285e /lib/tools.in
parent386c4275946520bc590428e730a9d515155436a0 (diff)
downloadbackupninja-4ecaae94054c4eb919ddbd45904d834383a09558.tar.gz
backupninja-4ecaae94054c4eb919ddbd45904d834383a09558.tar.bz2
Make all indentation consistent.
Previously, there were many indentation styles in use: Real tabs, 2, 3 or 4 spaces, mixing these within the same file, function or even within a single line. This commit changes all bash scripts in the handlers, src and lib dirs to use consistent indentation: three spaces are now used everywhere. Other files (e.g. Makefiles) are left untouched. Additionally, this commit removes all trailing whitespace.
Diffstat (limited to 'lib/tools.in')
-rw-r--r--lib/tools.in38
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/tools.in b/lib/tools.in
index 0005be9..0d368b8 100644
--- a/lib/tools.in
+++ b/lib/tools.in
@@ -10,39 +10,39 @@
# create a temporary file in a secure way.
#
function maketemp() {
- local tempfile=`mktemp /tmp/$1.XXXXXXXX`
- 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'
}