From 0f2eeda8387b6424c1963684d167d4cdaf4d27a8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 21 Mar 2011 08:35:25 +0100 Subject: [PATCH] include move of requirements and make move a loop Signed-off-by: Nico Schottelius --- bin/cdist-manifest-run-all | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all index 050e4850..80cd47be 100755 --- a/bin/cdist-manifest-run-all +++ b/bin/cdist-manifest-run-all @@ -98,17 +98,18 @@ while [ "$__cdist_new_objects_created" = "y" ]; do mv "${__cdist_new_object_dir}/${__cdist_name_object_source}" \ "$__cdist_object_dir" - # Parameter - if [ -d "${__cdist_new_object_dir}/${__cdist_name_parameter}" ]; then - mv "${__cdist_new_object_dir}/${__cdist_name_parameter}" \ - "$__cdist_object_dir" - fi - - # Explorer - if [ -d "${__cdist_new_object_dir}/${__cdist_name_explorer}" ]; then - mv "${__cdist_new_object_dir}/${__cdist_name_explorer}" \ - "$__cdist_object_dir" - fi + # Explorer, Parameter, Require + for __cdist_object_file in \ + ${__cdist_name_explorer} \ + ${__cdist_name_parameter} \ + ${__cdist_name_require} \ + ; do + + if [ -e "${__cdist_new_object_dir}/${__cdist_name_parameter}" ]; then + mv "${__cdist_new_object_dir}/${__cdist_object_file}" \ + "$__cdist_object_dir" + fi + done done < "$__cdist_new_objects_list" # Remove listing and objects, otherwise the next type will reuse it...