From e6d2a301c9bd35ae20725d721a3080e47ba8df79 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Tue, 14 Jun 2011 00:19:57 +0200
Subject: [PATCH] replace usage of cdist-dir and use new syntax

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-deploy-to           | 3 +--
 bin/cdist-explorer-run-global | 6 ++----
 bin/cdist-object-explorer-run | 7 +++----
 bin/cdist-object-push         | 3 +--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index bf5614bc..b28afbf2 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -48,8 +48,7 @@ __cdist_init_deploy           "$__cdist_target_host"
 
 # Transfer cdist executables
 __cdist_echo info "Transferring cdist binaries to the target host "
-cdist-dir push                "$__cdist_target_host" \
-   "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
+__cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 cdist-explorer-run-global     "$__cdist_target_host"
 cdist-manifest-run-init       "$__cdist_target_host"
 cdist-object-all              "$__cdist_target_host" cdist-object-prepare
diff --git a/bin/cdist-explorer-run-global b/bin/cdist-explorer-run-global
index b0c024f2..09b088f5 100755
--- a/bin/cdist-explorer-run-global
+++ b/bin/cdist-explorer-run-global
@@ -30,8 +30,7 @@ __cdist_target_host="$1"; shift
 __cdist_echo info "Running global explorers "
 
 # copy the explorers
-cdist-dir push "$__cdist_target_host" \
-   "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
+__cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
 
 # run the initial explorers remotely
 cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run  \
@@ -39,5 +38,4 @@ cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run  \
    "$__cdist_remote_out_explorer_dir"
 
 # retrieve the results
-cdist-dir pull "$__cdist_target_host" \
-   "${__cdist_remote_out_explorer_dir}" "${__cdist_out_explorer_dir}"
+__cdist_dir pull "${__cdist_remote_out_explorer_dir}" "${__cdist_out_explorer_dir}"
diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run
index b65c5cc1..8bdf50ce 100755
--- a/bin/cdist-object-explorer-run
+++ b/bin/cdist-object-explorer-run
@@ -40,13 +40,13 @@ if [ "$__cdist_has_explorer" ]; 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-dir push "$__cdist_target_host" "$src_dir" "$dst_dir"
+      __cdist_dir push "$src_dir" "$dst_dir"
       __cdist_type_explorer_pushed_add "$__cdist_type"
    fi
 
    __cdist_echo info "Running explorers"
    # Copy object parameters
-   cdist-dir push "$__cdist_target_host"                          \
+   __cdist_dir push \
       "$(__cdist_object_parameter_dir "$__cdist_object_self")"         \
       "$(__cdist_remote_object_parameter_dir "$__cdist_object_self")"
 
@@ -61,7 +61,6 @@ if [ "$__cdist_has_explorer" ]; then
       "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")"
 
    # Copy back results
-   cdist-dir pull "$__cdist_target_host"                             \
-      "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" \
+   __cdist_dir pull "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" \
       "$(__cdist_object_type_explorer_dir "$__cdist_object_self")"
 fi
diff --git a/bin/cdist-object-push b/bin/cdist-object-push
index 62b00cb2..8c2c935c 100755
--- a/bin/cdist-object-push
+++ b/bin/cdist-object-push
@@ -30,6 +30,5 @@ __cdist_target_host="$1"; shift
 __cdist_object_self="$1"; shift
 
 __cdist_echo info "Transferring object"
-cdist-dir push "$__cdist_target_host" \
-   "$(__cdist_object_dir "$__cdist_object_self")" \
+__cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \
    "$(__cdist_remote_object_dir "$__cdist_object_self")"