update configuration

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2010-09-30 19:09:21 +02:00
parent c24cf52ce4
commit fb76e81f17
1 changed files with 10 additions and 4 deletions

View File

@ -27,18 +27,25 @@
: ${CDIST_HOSTS:=$CDIST_CONFIG/hosts} : ${CDIST_HOSTS:=$CDIST_CONFIG/hosts}
: ${CDIST_MODULES:=$CDIST_CONFIG/modules} : ${CDIST_MODULES:=$CDIST_CONFIG/modules}
# create basedir + tempfile for direct usage
: ${CDIST_TMPBASEDIR:=/tmp}
: ${CDIST_TMPDIR:=$(mktemp -d "$CDIST_TMPBASEDIR/cdist.XXXXXXXXXXXX")}
: ${CDIST_TMP:=$(mktemp "$CDIST_TMPDIR/cdist.XXXXXXXXXXXX")}
################################################################################ ################################################################################
# cconf standard vars prefixed with cdist # cconf standard vars prefixed with cdist
__cdist_pwd="$(pwd -P)" __cdist_pwd="$(pwd -P)"
__cdist_mydir="${0%/*}"; __cdist_mydir="${0%/*}";
__cdist_abs_mydir="$(cd "$__mydir" && pwd -P)" __cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
__cdist_myname=${0##*/}; __cdist_myname=${0##*/};
__cdist_abs_myname="$__abs_mydir/$__myname" __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
__cdist_debug_echo() __cdist_debug_echo()
{ {
[ "$CDIST_DEBUG" ] && echo "Debug: $@" if [ "$CDIST_DEBUG" ]; then
echo "Debug: $@"
fi
} }
__cdist_usage() __cdist_usage()
@ -47,7 +54,6 @@ __cdist_usage()
exit 1 exit 1
} }
: ${CDIST_TMP:=$(mktemp /tmp/cdist.XXXXXXXXXXXX)}
#set -e #set -e