From f3a88ef98d156bbbbc5fa5f07fc71cef7e58d9e5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 17 Jun 2011 12:31:00 +0200
Subject: [PATCH] ../bin/cdist-config -> __cdist_echo

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config    | 35 ---------------------------
 bin/cdist-deploy-to |  4 ++--
 core/__cdist_echo   | 58 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100755 core/__cdist_echo

diff --git a/bin/cdist-config b/bin/cdist-config
index 13cba8c5..74d9eed7 100644
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -162,41 +162,6 @@ for __cdist_lib in $__cdist_core_dir/*; do
    . "$__cdist_lib"
 done
 
-__cdist_echo()
-{
-   __cdist_echo_type="$1"; shift
-
-   set +u
-   if [ "$__cdist_object_self" ]; then
-      __cdist_echo_prefix="${__cdist_object_self}:"
-   else
-      __cdist_echo_prefix="core: "
-   fi
-   set -u
-
-   case "$__cdist_echo_type" in
-      debug)
-         set +u
-         if [ "$__cdist_debug" ]; then
-            echo $__cdist_echo_prefix "Debug: $@"
-         fi
-         set -u
-      ;;
-      info)
-         echo $__cdist_echo_prefix "$@"
-      ;;
-      warn)
-         echo $__cdist_echo_prefix "Warning: $@"
-      ;;
-      error)
-         echo $__cdist_echo_prefix "Error: $@" >&2
-      ;;
-      *)
-         echo "CORE BUG, who created the broken commit in $0?" >&2
-         exit 23
-      ;;
-   esac
-}
 
 __cdist_exec_fail_on_error()
 {
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index baeff220..cf286564 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -36,8 +36,6 @@ export $__cdist_name_var_target_user="$__cdist_remote_user"
 
 # Export variables for core, which others do not reset
 export __cdist_local_base_dir
-
-# Load library always from the checkout
 export __cdist_core_dir
 
 __cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host "
@@ -49,6 +47,8 @@ __cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host "
 # Prepare local and remote directories
 __cdist_init_deploy           "$__cdist_target_host"
 
+FIXME: stopped here!
+
 # Transfer cdist executables
 __cdist_echo info "Transferring cdist binaries/functions to the target host "
 __cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
diff --git a/core/__cdist_echo b/core/__cdist_echo
new file mode 100755
index 00000000..2fcc93f0
--- /dev/null
+++ b/core/__cdist_echo
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# 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/>.
+#
+#
+# echo / syslog alike function
+#
+
+__cdist_echo()
+{
+   __cdist_echo_type="$1"; shift
+
+   set +u
+   if [ "$__cdist_object_self" ]; then
+      __cdist_echo_prefix="${__cdist_object_self}:"
+   else
+      __cdist_echo_prefix="core: "
+   fi
+   set -u
+
+   case "$__cdist_echo_type" in
+      debug)
+         set +u
+         if [ "$__cdist_debug" ]; then
+            echo $__cdist_echo_prefix "Debug: $@"
+         fi
+         set -u
+      ;;
+      info)
+         echo $__cdist_echo_prefix "$@"
+      ;;
+      warn)
+         echo $__cdist_echo_prefix "Warning: $@"
+      ;;
+      error)
+         echo $__cdist_echo_prefix "Error: $@" >&2
+      ;;
+      *)
+         echo "CORE BUG, who created the broken commit in $0?" >&2
+         exit 23
+      ;;
+   esac
+}