remove ... dots ... make ... me ...feel ... weired
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
bc1c7f104e
commit
0a3a434269
9 changed files with 14 additions and 14 deletions
|
@ -32,6 +32,6 @@ __cdist_ddir="$(__cdist_host_cache_dir "$__cdist_target_host")"
|
|||
# Create base to move into
|
||||
mkdir -p "$(__cdist_cache_dir)"
|
||||
|
||||
__cdist_echo info "Saving cache to $__cdist_ddir ..."
|
||||
__cdist_echo info "Saving cache to $__cdist_ddir "
|
||||
rm -rf "$__cdist_ddir"
|
||||
mv "$__cdist_local_base_dir" "$__cdist_ddir"
|
||||
|
|
|
@ -207,7 +207,7 @@ __cdist_usage()
|
|||
|
||||
__cdist_init_deploy()
|
||||
{
|
||||
echo "Creating clean directory structure ..."
|
||||
__cdist_echo info "Creating clean directory structure "
|
||||
|
||||
# Ensure there is no old stuff, neither local nor remote
|
||||
rm -rf "$__cdist_local_base_dir"
|
||||
|
|
|
@ -34,7 +34,7 @@ export $__cdist_name_var_target_user="$__cdist_remote_user"
|
|||
# Export variables for core, which others do not reset
|
||||
export __cdist_local_base_dir
|
||||
|
||||
__cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host ..."
|
||||
__cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host "
|
||||
|
||||
################################################################################
|
||||
# See cdist-stages(7)
|
||||
|
@ -44,7 +44,7 @@ __cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host ..."
|
|||
__cdist_init_deploy "$__cdist_target_host"
|
||||
|
||||
# Transfer cdist executables
|
||||
__cdist_echo info "Transferring cdist binaries to the target host ..."
|
||||
__cdist_echo info "Transferring cdist binaries to the target host "
|
||||
cdist-dir push "$__cdist_target_host" \
|
||||
"${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
|
||||
cdist-explorer-run-global "$__cdist_target_host"
|
||||
|
|
|
@ -27,7 +27,7 @@ set -ue
|
|||
|
||||
__cdist_target_host="$1"; shift
|
||||
|
||||
__cdist_echo info "Running global explorers ..."
|
||||
__cdist_echo info "Running global explorers "
|
||||
|
||||
# copy the explorers
|
||||
cdist-dir push "$__cdist_target_host" \
|
||||
|
|
|
@ -30,5 +30,5 @@ __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_echo info "Running initial manifest for $__cdist_target_host "
|
||||
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#
|
||||
|
||||
. cdist-config
|
||||
[ $# -ge 1 ] || __cdist_usage "[-p] <target host> [target host ...]"
|
||||
[ $# -ge 1 ] || __cdist_usage "[-p] <target host> [target host ]"
|
||||
set -eu
|
||||
|
||||
parallel=""
|
||||
|
@ -42,6 +42,6 @@ done
|
|||
|
||||
# else wait after all are started
|
||||
if [ "$parallel" ]; then
|
||||
__cdist_echo info "Waiting for cdist-deploy-to jobs to finish..."
|
||||
__cdist_echo info "Waiting for cdist-deploy-to jobs to finish"
|
||||
wait
|
||||
fi
|
||||
|
|
|
@ -39,12 +39,12 @@ if [ "$__cdist_has_explorer" ]; then
|
|||
if ! __cdist_type_explorer_pushed "$__cdist_type"; then
|
||||
src_dir="$(__cdist_type_explorer_dir "$__cdist_type")"
|
||||
dst_dir="$(__cdist_remote_type_explorer_dir "$__cdist_type")"
|
||||
__cdist_echo info "Transfering explorers for $__cdist_type ..."
|
||||
__cdist_echo info "Transfering explorers for $__cdist_type "
|
||||
cdist-dir push "$__cdist_target_host" "$src_dir" "$dst_dir"
|
||||
__cdist_type_explorer_pushed_add "$__cdist_type"
|
||||
fi
|
||||
|
||||
__cdist_echo info "Running explorers ..."
|
||||
__cdist_echo info "Running explorers "
|
||||
# Copy object parameters
|
||||
cdist-dir push "$__cdist_target_host" \
|
||||
"$(__cdist_object_parameter_dir "$__cdist_object_self")" \
|
||||
|
|
|
@ -34,11 +34,11 @@ __cdist_code_remote="$(__cdist_object_code "$__cdist_object_self")-${__cdist_nam
|
|||
|
||||
# FIXME: check that no file is created if there is no gencode
|
||||
# probably move output code to cdist-object-gencode
|
||||
__cdist_echo info "Generating local code ..."
|
||||
__cdist_echo info "Generating local code "
|
||||
cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
|
||||
"${__cdist_name_gencode_local}" > "${__cdist_code_local}"
|
||||
|
||||
__cdist_echo info "Generating remote code ..."
|
||||
__cdist_echo info "Generating remote code "
|
||||
cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
|
||||
"${__cdist_name_gencode_remote}" > "${__cdist_code_remote}"
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ __cdist_object_self="$1"; shift
|
|||
__cdist_cur_object_dir="$(__cdist_object_dir "$__cdist_object_self")"
|
||||
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
|
||||
|
||||
__cdist_echo info "Checking manifest ..."
|
||||
__cdist_echo info "Checking manifest "
|
||||
|
||||
__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
|
||||
__cdist_manifest="$(__cdist_type_manifest "$__cdist_type")"
|
||||
|
@ -43,7 +43,7 @@ if [ -f "$__cdist_manifest" ]; then
|
|||
# Make __cdist_manifest available for cdist-type-emulator
|
||||
export __cdist_manifest
|
||||
|
||||
__cdist_echo info "Executing manifest ..."
|
||||
__cdist_echo info "Executing manifest "
|
||||
export $__cdist_name_var_object="$__cdist_cur_object_dir"
|
||||
export $__cdist_name_var_object_id="$__cdist_object_id"
|
||||
export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
|
||||
|
|
Loading…
Reference in a new issue