From 2e0d1b78fb0551543db8f115df728f41fca94b14 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 23 Feb 2011 18:10:26 +0100
Subject: [PATCH] rename: cdist-remote-* = remote

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config                                      |  6 ++----
 bin/cdist-explorer-run                                | 11 ++---------
 ...-explorer-remote-run => cdist-remote-explorer-run} |  0
 bin/{cdist-remote-run => cdist-run-remote}            |  0
 4 files changed, 4 insertions(+), 13 deletions(-)
 rename bin/{cdist-explorer-remote-run => cdist-remote-explorer-run} (100%)
 rename bin/{cdist-remote-run => cdist-run-remote} (100%)

diff --git a/bin/cdist-config b/bin/cdist-config
index 31a83997..8deaa86b 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -33,7 +33,6 @@ set -au
 : ${__cdist_name_code:=code}
 : ${__cdist_name_explorer:=explorers}
 : ${__cdist_name_gencode:=gencode}
-: ${__cdist_name_helper:=helper}
 : ${__cdist_name_host:=hosts}
 : ${__cdist_name_init:=init}
 : ${__cdist_name_out_dir:=out_dir}
@@ -63,7 +62,6 @@ set -au
 # Base
 : ${__cdist_config:=/etc/cdist}
 : ${__cdist_explorer_dir:=$__cdist_config/$__cdist_name_explorer}
-: ${__cdist_helper_dir:=$__cdist_config/$__cdist_name_helper}
 : ${__cdist_manifest_dir:=$__cdist_config/$__cdist_name_manifests}
 : ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init}
 : ${__cdist_type_dir:=$__cdist_config/$__cdist_name_type}
@@ -80,9 +78,9 @@ __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
 # Remote config
 : ${__cdist_remote_conf_dir:=$__cdist_remote_base_dir/$__cdist_name_conf_dir}
 : ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer}
-: ${__cdist_remote_helper_dir:=$__cdist_remote_conf_dir/$__cdist_name_helper}
+: ${__cdist_remote_bin_dir:=$__cdist_remote_conf_dir/$__cdist_name_bin}
 
-# Remote out
+# Remot} out
 : ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
 : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}
 
diff --git a/bin/cdist-explorer-run b/bin/cdist-explorer-run
index c975c35a..e558015e 100755
--- a/bin/cdist-explorer-run
+++ b/bin/cdist-explorer-run
@@ -18,8 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# FIXME: Replace * references: * breaks if there is no explorer
-# or FIXME: check that there is at least one explorer?
+# Run already copied explorers
 #
 
 
@@ -31,10 +30,4 @@ set -ue
 
 __cdist_target_host="$1"; shift
 
-cdist-helper-exec "${__cdist_target_host}" "cdist-explorer-remote-run" "$@"
-
-exit 23
-
-# use this in cdist-helper-exec
-ssh "${__cdist_remote_user}@${__cdist_target_host}"   \
-      "${__cdist_remote_helper_dir}/cdist-explorer-remote-run" "$@"
+cdist-run-remote "${__cdist_target_host}" "cdist-remote-explorer-run" "$@"
diff --git a/bin/cdist-explorer-remote-run b/bin/cdist-remote-explorer-run
similarity index 100%
rename from bin/cdist-explorer-remote-run
rename to bin/cdist-remote-explorer-run
diff --git a/bin/cdist-remote-run b/bin/cdist-run-remote
similarity index 100%
rename from bin/cdist-remote-run
rename to bin/cdist-run-remote