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

bugfix + real use of __cdist_echo

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-04-06 21:07:39 +02:00
commit 96c4024a51
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/cdist-object-explorer-run
View file

@ -27,11 +27,10 @@
set -eu set -eu
__cdist_target_host="$1"; shift __cdist_target_host="$1"; shift
__cdist_object="$1"; shift __cdist_object_self="$1"; shift
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")" __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
__cdist_type="$(__cdist_type_from_object "$__cdist_object")" __cdist_type="$(__cdist_type_from_object "$__cdist_object")"
__cdist_object_self="$__cdist_type/$__cdist_object_id"
# Check if type of object has >= 1 explorer # Check if type of object has >= 1 explorer
__cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")" __cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
@ -45,7 +44,7 @@ if [ "$__cdist_has_explorer" ]; then
__cdist_type_explorer_pushed_add "$__cdist_type" __cdist_type_explorer_pushed_add "$__cdist_type"
fi fi
__cdist_echo info "Running explorers for $__cdist_object ..." __cdist_echo info "Running explorers ..."
# Copy object parameters # Copy object parameters
cdist-dir push "$__cdist_target_host" \ cdist-dir push "$__cdist_target_host" \
"$(__cdist_object_parameter_dir "$__cdist_object")" \ "$(__cdist_object_parameter_dir "$__cdist_object")" \
@ -53,9 +52,9 @@ if [ "$__cdist_has_explorer" ]; then
# Execute explorers # Execute explorers
cdist-run-remote "$__cdist_target_host" \ cdist-run-remote "$__cdist_target_host" \
"$__cdist_name_var_object=\"$(__cdist_remote_object_dir "$__cdist_object")\"" \ "$__cdist_name_var_object=\"$(__cdist_remote_object_dir "$__cdist_object_self")\"" \
"$__cdist_name_var_object_id=\"$__cdist_object_id\" \ "$__cdist_name_var_object_id=\"$__cdist_object_id\"" \
"$__cdist_name_var_self=\"$__cdist_object\"" \ "$__cdist_name_var_self=\"$__cdist_object_self\"" \
cdist-remote-explorer-run \ cdist-remote-explorer-run \
"$__cdist_name_var_type_explorer" \ "$__cdist_name_var_type_explorer" \
"$(__cdist_remote_type_explorer_dir "$__cdist_type")" \ "$(__cdist_remote_type_explorer_dir "$__cdist_type")" \