From 31a0b6c3d0b202f6624f236c122d27a93b9ce3e7 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Sat, 26 Mar 2011 01:43:55 +0100 Subject: [PATCH] fixed inconsistencies between local and remote variable naming - /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/ - __cdist_remote_object_dir += __cdist_name_dot_cdist Signed-off-by: Steven Armstrong --- bin/cdist-code-run-all | 2 +- bin/cdist-config | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/cdist-code-run-all b/bin/cdist-code-run-all index 1486cc46..6f5aeb92 100755 --- a/bin/cdist-code-run-all +++ b/bin/cdist-code-run-all @@ -44,7 +44,7 @@ while [ $# -ge 1 ]; do # Code remote cdist-run-remote "$__cdist_target_host" \ - "export __cdist_out_object_dir=\"$__cdist_remote_out_object_base_dir\";" \ + "export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \ "cdist-code-run" "$object" "${__cdist_name_gencode_remote}" \ || __cdist_exit_err "Remote code failed for $object" done < "$__cdist_tmp_file" diff --git a/bin/cdist-config b/bin/cdist-config index 86039f00..26139819 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -131,7 +131,7 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX") # : ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir} : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer} -: ${__cdist_remote_out_object_base_dir:=$__cdist_remote_out_dir/$__cdist_name_object} +: ${__cdist_remote_out_object_dir:=$__cdist_remote_out_dir/$__cdist_name_object} ################################################################################ # Internal functions @@ -254,9 +254,14 @@ __cdist_object_type_explorer_dir() # Remote # +__cdist_remote_object_base_dir() +{ + echo "${__cdist_remote_out_object_dir}/$1" +} + __cdist_remote_object_dir() { - echo "${__cdist_remote_out_object_base_dir}/$1" + echo "$(__cdist_remote_object_base_dir "$1")/${__cdist_name_dot_cdist}" } __cdist_remote_object_parameter_dir()