From 6ffd99fe6799808966bd3a301732e875673628d5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 23 Feb 2011 16:25:41 +0100 Subject: [PATCH] cleanup and break bin/cdist-deploy-to Signed-off-by: Nico Schottelius --- bin/cdist-deploy-to | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to index 1c7a142d..2bcf26cc 100755 --- a/bin/cdist-deploy-to +++ b/bin/cdist-deploy-to @@ -27,30 +27,24 @@ set -eu __cdist_target_host="$1" -: ${__cdist_out_objects:="$__cdist_tmp_dir/$__cdist_name_object"} -: ${__cdist_out_execs:="$__cdist_tmp_dir/$__cdist_name_exec"} - -export __cdist_out_objects -export __cdist_out_execs - # See cdist-stages(7) cdist-explorer-run-init "$__cdist_target_host" "$__cdist_out_explorer_dir" exit 2 -cdist-manifest-init "$__cdist_target_host" "$__cdist_out_objects" -cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_objects" -cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_objects" +cdist-manifest-init "$__cdist_target_host" "$__cdist_out_object_dir" +cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_object_dir" +cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_object_dir" exit 0 -cdist-object-codegen-all "$__cdist_target_host" "$__cdist_out_objects" "$__cdist_out_execs" +cdist-object-codegen-all "$__cdist_target_host" "$__cdist_out_object_dir" "$__cdist_out_execs" cdist-exec-transfer "$__cdist_target_host" "$__cdist_out_execs" cdist-exec-run "$__cdist_target_host" # FIXME: Create new cache from results: -# cdist-cache-copy "$__cdist_target_host" __cdist_out_explorers __cdist_out_objects __cdist_out_execs +# cdist-cache-copy "$__cdist_target_host" __cdist_out_explorers __cdist_out_object_dir __cdist_out_execs # or similar, better with one directory # # echo rm -rf "$(__cdist_cache_host)" # mkdir -p "$(__cdist_cache_host)" -# mv "$__cdist_out_explorers" "$__cdist_out_objects" "$(__cdist_cache_host)" +# mv "$__cdist_out_explorers" "$__cdist_out_object_dir" "$(__cdist_cache_host)" # Also save last code fragment # mv "$tmp_code" "$(__cdist_cache_host)"