From 47c32d1b535db2e53acdfd985e630c01d28cb2c0 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 14 Jun 2011 01:22:51 +0200 Subject: [PATCH] ../core/__cdist_manifest_run_init Signed-off-by: Nico Schottelius --- bin/cdist-deploy-to | 2 +- core/__cdist_manifest_run | 2 -- .../__cdist_manifest_run_init | 15 ++++++--------- 3 files changed, 7 insertions(+), 12 deletions(-) rename bin/cdist-manifest-run-init => core/__cdist_manifest_run_init (74%) diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to index 9d5573f3..6b3f2ee1 100755 --- a/bin/cdist-deploy-to +++ b/bin/cdist-deploy-to @@ -55,7 +55,7 @@ __cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}" __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}" cdist-explorer-run-global "$__cdist_target_host" -cdist-manifest-run-init "$__cdist_target_host" +__cdist_manifest_run_init "$__cdist_target_host" __cdist_object_all __cdist_object_prepare __cdist_object_all __cdist_object_run cdist-cache "$__cdist_target_host" diff --git a/core/__cdist_manifest_run b/core/__cdist_manifest_run index f2283f85..0ba5f515 100755 --- a/core/__cdist_manifest_run +++ b/core/__cdist_manifest_run @@ -24,9 +24,7 @@ __cdist_manifest_run() { - [ $# -eq 1 ] || __cdist_usage "" - set -u __cdist_manifest="$1"; shift diff --git a/bin/cdist-manifest-run-init b/core/__cdist_manifest_run_init similarity index 74% rename from bin/cdist-manifest-run-init rename to core/__cdist_manifest_run_init index 787d2315..2d694900 100755 --- a/bin/cdist-manifest-run-init +++ b/core/__cdist_manifest_run_init @@ -22,13 +22,10 @@ # And save it into the cache tree # -. cdist-config -[ $# -eq 1 ] || __cdist_usage "" -set -e +__cdist_manifest_run_init() +{ + eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\" -__cdist_target_host="$1"; shift - -eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\" - -__cdist_echo info "Running initial manifest for $__cdist_target_host " -__cdist_manifest_run "$__cdist_manifest_init" + __cdist_echo info "Running initial manifest for $__cdist_target_host " + __cdist_manifest_run "$__cdist_manifest_init" +}