From f358a34e1d26ab4f4dfbf7e44149827250486be3 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 17 Mar 2011 20:40:22 +0100
Subject: [PATCH] obsolete cdist-bin-transfer

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-bin-transfer | 50 ------------------------------------------
 bin/cdist-deploy-to    |  5 +++--
 conf/manifest/init     |  2 +-
 3 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100755 bin/cdist-bin-transfer

diff --git a/bin/cdist-bin-transfer b/bin/cdist-bin-transfer
deleted file mode 100755
index e9a0a320..00000000
--- a/bin/cdist-bin-transfer
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Transfer all executables
-#
-
-. cdist-config
-[ $# -eq 1 ] || __cdist_usage "<target host>"
-set -eu
-
-__cdist_target_host="$1"; shift
-
-# Find directory that contains cdist binaries
-__cdist_conf_dir_path=$(which cdist-config)
-__cdist_src_base=${__cdist_conf_dir_path%config}
-
-# Help the user
-echo "Transferring cdist binaries ..."
-
-# re-create basedir so it's clean
-ssh "${__cdist_remote_user}@${__cdist_target_host}" \
-   "rm -rf \"${__cdist_remote_bin_dir}\" && mkdir -p \"${__cdist_remote_bin_dir}\""
-
-# Transfer cdist-* to the remote host
-scp -qr "${__cdist_src_base}"* \
-       "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_remote_bin_dir}"
-
-# Adjust cdist-config to contain static version string
-tmp_version="$__cdist_version"
-sed "s/^: \${\(__cdist_version\):=.*/\1=\"$tmp_version\"/" "$(which cdist-config)" | \
-   ssh -q "${__cdist_remote_user}@${__cdist_target_host}"                     \
-      "cat > \"${__cdist_remote_bin_dir}\"/cdist-config"
-
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 0693a051..3d83dfec 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -42,8 +42,9 @@ echo "cdist $__cdist_version: Configuring $__cdist_target_host"
 # Prepare local and remote directories
 __cdist_init_deploy           "$__cdist_target_host"
 
-# Transfer cdist "binaries"
-cdist-bin-transfer            "$__cdist_target_host"
+# Transfer cdist executables
+echo "Transferring cdist binaries ...X"
+cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 
 # Execute general explorers
 cdist-explorer-run-init       "$__cdist_target_host" "$__cdist_out_explorer_dir"
diff --git a/conf/manifest/init b/conf/manifest/init
index 85a9a359..e54f83aa 100755
--- a/conf/manifest/init
+++ b/conf/manifest/init
@@ -13,7 +13,7 @@ case "$__target_host" in
    # Everybody has this
    localhost)
       __link /tmp/cdist-testfile --source /etc/cdist-configured  --type symbolic
-      __directory /tmp/cdist-test-dir --mode 4777
+      require="foo" __directory /tmp/cdist-test-dir --mode 4777
       __file /tmp/cdist-test-file --mode 0750 --owner nobody --group root
    ;;