From 618287efaad92083b981fb02ecf1a151700f8e38 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 18 Mar 2011 00:15:02 +0100 Subject: [PATCH] argc == 1 for cdist-object-explorer-all Signed-off-by: Nico Schottelius --- bin/cdist-deploy-to | 4 +--- bin/cdist-object-explorer-all | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to index 1461d526..07e0459a 100755 --- a/bin/cdist-deploy-to +++ b/bin/cdist-deploy-to @@ -49,9 +49,7 @@ cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_b cdist-explorer-run-global "$__cdist_target_host" cdist-manifest-run-init "$__cdist_target_host" cdist-manifest-run-all "$__cdist_target_host" - -# Run explorer of each type for every object of types with explorer -cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_object_dir" +cdist-object-explorer-all "$__cdist_target_host" # Generate code for all objects cdist-object-gencode-all "$__cdist_target_host" "$__cdist_out_object_dir" diff --git a/bin/cdist-object-explorer-all b/bin/cdist-object-explorer-all index 8d6ab54a..8654b03f 100755 --- a/bin/cdist-object-explorer-all +++ b/bin/cdist-object-explorer-all @@ -22,18 +22,17 @@ # . cdist-config -[ $# -eq 2 ] || __cdist_usage " " +[ $# -eq 1 ] || __cdist_usage "" set -eu __cdist_target_host="$1"; shift -__cdist_object_base_dir="$1"; shift object_listing="$__cdist_tmp_dir/objects" type_listing_all="$__cdist_tmp_dir/types_all" type_listing="$__cdist_tmp_dir/types" # Get listing of objects -__cdist_object_list "$__cdist_object_base_dir" > "$object_listing" +__cdist_object_list "$__cdist_out_object_dir" > "$object_listing" # Get listing of types used while read object; do