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

sed -i 's/__cdist_name_type_params/__cdist_name_params/g'

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 10:12:26 +01:00
parent b222b79407
commit ce69491c34
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/cdist-config
View file

@ -44,9 +44,9 @@ set -u
: ${__cdist_name_object:=objects}
: ${__cdist_name_type:=types}
: ${__cdist_name_type_params:=parameters}
: ${__cdist_name_type_params_required:=required}
: ${__cdist_name_type_params_optional:=optional}
: ${__cdist_name_params:=parameters}
: ${__cdist_name_params_required:=required}
: ${__cdist_name_params_optional:=optional}
# Name of the executable generated
: ${__cdist_name_exec:=exec}
@ -152,7 +152,7 @@ __cdist_type_param_file()
local type="$1"; shift
local paramtype="$1"; shift
echo "${__cdist_type_dir}/$type/$__cdist_name_type_params/$paramtype"
echo "${__cdist_type_dir}/$type/$__cdist_name_params/$paramtype"
}
__cdist_type_from_object()

6
bin/cdist_tree_wrapper
View file

@ -51,7 +51,7 @@ mkdir -p "${__cdist_ddir}"
echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
# Record parameters to subdir
tempparams="${__cdist_tmp_dir}/${__cdist_name_type_params}"
tempparams="${__cdist_tmp_dir}/${__cdist_name_params}"
mkdir -p "$tempparams"
while [ $# -gt 0 ]; do
@ -76,14 +76,14 @@ while read required; do
fi
mv "${tempparams}/${required}" "${__cdist_ddir}"
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_required")"
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}"
fi
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_optional")"
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_params_optional")"
# Error out on other paramaters
cd "${tempparams}"