From 580b5da688cfcc21bc25ac3285552e8dae7b9a04 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 14 Jun 2011 00:47:24 +0200 Subject: [PATCH] remove obsolete cdist-object-push Signed-off-by: Nico Schottelius --- bin/cdist-object-push | 34 ---------------------------------- bin/cdist-object-run | 3 ++- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100755 bin/cdist-object-push diff --git a/bin/cdist-object-push b/bin/cdist-object-push deleted file mode 100755 index 8c2c935c..00000000 --- a/bin/cdist-object-push +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# 2011 Steven Armstrong (steven-cdist at armstrong.cc) -# -# 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 . -# -# -# Transfer the given object to the target host. -# - -. cdist-config -[ $# -eq 2 ] || __cdist_usage " " -set -eu - -__cdist_target_host="$1"; shift -__cdist_object_self="$1"; shift - -__cdist_echo info "Transferring object" -__cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \ - "$(__cdist_remote_object_dir "$__cdist_object_self")" diff --git a/bin/cdist-object-run b/bin/cdist-object-run index f96462d7..012be584 100755 --- a/bin/cdist-object-run +++ b/bin/cdist-object-run @@ -57,7 +57,8 @@ if [ ! -f "$__cdist_object_finished" ]; then fi __cdist_object_gencode_run "$__cdist_object_self" - cdist-object-push "$__cdist_target_host" "$__cdist_object_self" + __cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \ + "$(__cdist_remote_object_dir "$__cdist_object_self")" cdist-object-code-run "$__cdist_target_host" "$__cdist_object_self" # Mark this object as done