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

save parameters below parameters/ in the object

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 10:21:43 +01:00
parent ce69491c34
commit 91b4b163cd
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/cdist_tree_wrapper
View file

@ -36,6 +36,7 @@ echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
__cdist_object="${__cdist_type}/${__cdist_object_id}"
__cdist_ddir="$__cdist_output_dir/${__cdist_object}"
__cdist_params_dir="$__cdist_ddir/$__cdist_name_params"
# Append id for error messages
__cdist_myname="$__cdist_myname ($__cdist_object_id)"
@ -46,11 +47,12 @@ if [ -e "${__cdist_ddir}" ]; then
fi
mkdir -p "${__cdist_ddir}"
mkdir -p "${__cdist_params_dir}"
# Record (correct ;-) source
echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
# Record parameters to subdir
# Record parameters to tmpdir
tempparams="${__cdist_tmp_dir}/${__cdist_name_params}"
mkdir -p "$tempparams"
@ -75,13 +77,13 @@ while read required; do
__cdist_usage "Missing required parameter $required"
fi
mv "${tempparams}/${required}" "${__cdist_ddir}"
mv "${tempparams}/${required}" "${__cdist_params_dir}"
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_params_required")"
# Allow optional parameters
while read optional; do
if [ -f "${tempparams}/${optional}" ]; then
mv "${tempparams}/${optional}" "${__cdist_ddir}"
mv "${tempparams}/${optional}" "${__cdist_params_dir}"
fi
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_params_optional")"