evilham
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into types_explorer

This commit is contained in:
Nico Schottelius 2011-02-23 09:24:25 +01:00
parent 9bdfeb6198 cea051a105
commit 53b51b0ead
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/cdist_tree_wrapper
View File

@ -25,13 +25,11 @@
# #
. cdist-config . cdist-config
[ $# -ge 1 ] || __cdist_usage "<id> <options>" [ $# -ge 1 ] || __cdist_usage "<id> <options>"
set -eu set -eu
export __cdist_object_id="$1"; shift __cdist_object_id="$1"; shift
export __cdist_type="$__cdist_myname" __cdist_type="$__cdist_myname"
echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \ echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
__cdist_usage "Insane object id, ${__cdist_object_id}." __cdist_usage "Insane object id, ${__cdist_object_id}."
@ -53,7 +51,7 @@ mkdir -p "${__cdist_ddir}"
echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}" echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
# Record parameters to subdir # Record parameters to subdir
tempparams="${__cdist_tmp_dir}/params" tempparams="${__cdist_tmp_dir}/${__cdist_name_type_params}"
mkdir -p "$tempparams" mkdir -p "$tempparams"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
@ -82,7 +80,7 @@ done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_req
# Allow optional parameters # Allow optional parameters
while read optional; do while read optional; do
if [ -f "${tempparams}/${opt_file}" ]; then if [ -f "${tempparams}/${optional}" ]; then
mv "${tempparams}/${optional}" "${__cdist_ddir}" mv "${tempparams}/${optional}" "${__cdist_ddir}"
fi fi
done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_optional")" done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_optional")"

6
conf/types/__file/gencode
View File

@ -33,11 +33,11 @@ fi
case "$type" in case "$type" in
directory) directory)
echo mkdir \"$path\" echo mkdir \"$destination\"
;; ;;
file) file)
echo touch \"$path\" echo touch \"$destination\"
;; ;;
*) *)
@ -48,5 +48,5 @@ esac
if [ -f mode ]; then if [ -f mode ]; then
mode="$(cat mode)" mode="$(cat mode)"
echo chmod \"$mode\" \"$path\" echo chmod \"$mode\" \"$destination\"
fi fi