kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed inconsistencies between local and remote variable naming

Browse source 
- /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
- __cdist_remote_object_dir += __cdist_name_dot_cdist

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-03-26 01:43:55 +01:00
parent b740a4b934
commit 31a0b6c3d0
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/cdist-code-run-all
View file

@ -44,7 +44,7 @@ while [ $# -ge 1 ]; do
# Code remote # Code remote
cdist-run-remote "$__cdist_target_host" \ 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-code-run" "$object" "${__cdist_name_gencode_remote}" \
|| __cdist_exit_err "Remote code failed for $object" || __cdist_exit_err "Remote code failed for $object"
done < "$__cdist_tmp_file" done < "$__cdist_tmp_file"

9
bin/cdist-config
View file

@ -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_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
: ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer} : ${__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 # Internal functions
@ -254,9 +254,14 @@ __cdist_object_type_explorer_dir()
# Remote # Remote
# #
__cdist_remote_object_base_dir()
{
echo "${__cdist_remote_out_object_dir}/$1"
}
__cdist_remote_object_dir() __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() __cdist_remote_object_parameter_dir()