stephan/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

make scripts more variable and less dependent on each other

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-07 23:59:21 +01:00
commit 425f2bb71a
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/cdist_tree_wrapper
View file

@ -35,14 +35,15 @@ echo "I am $__cdist_myname and have been called with $@"
export __cdist_object_id="$1"; shift
export __cdist_type_current="$__cdist_myname"
echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || __cdist_usage "Provide sane id, please"
echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
__cdist_usage "Insane object id, ${__cdist_object_id}."
__cdist_tid="${__cdist_myname}/${__cdist_object_id}"
__cdist_ddir="$(__cdist_cache_host)/${__cdist_name_object}/${__cdist_tid}"
__cdist_tid="${__cdist_type_current}/${__cdist_object_id}"
__cdist_ddir="$__cdist_output_dir/${__cdist_tid}"
if [ -e "${__cdist_ddir}" ]; then
source="$(cat "${__cdist_ddir}/${__cdist_object_source}")"
__cdist_usage "${__cdist_tid} already exists (source: $source)"
source="$(__cdist_object_source "${__cdist_ddir}")"
__cdist_exit_err "${__cdist_tid} already exists (source: $source)"
fi
mkdir -p "${__cdist_ddir}"