From 1d46898737fbcc3e99b26a2c8a82dee5ea0f0623 Mon Sep 17 00:00:00 2001
From: AJ Bowen <aj@soulshake.net>
Date: Sun, 29 Oct 2017 15:55:08 +0100
Subject: [PATCH] Reverse 'echo >/dev/stderr' for '>/dev/stderr echo' according
 to @jpetazzo preference

---
 prepare-vms/lib/cli.sh      | 16 ++++++++--------
 prepare-vms/lib/commands.sh |  4 ++--
 prepare-vms/lib/pssh.sh     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/prepare-vms/lib/cli.sh b/prepare-vms/lib/cli.sh
index b3a993e8..b20e6c8c 100644
--- a/prepare-vms/lib/cli.sh
+++ b/prepare-vms/lib/cli.sh
@@ -13,15 +13,15 @@ die() {
 }
 
 error() {
-    echo >/dev/stderr "[$(red ERROR)] $1"
+    >/dev/stderr echo "[$(red ERROR)] $1"
 }
 
 warning() {
-    echo >/dev/stderr "[$(yellow WARNING)] $1"
+    >/dev/stderr echo "[$(yellow WARNING)] $1"
 }
 
 info() {
-    echo >/dev/stderr "[$(green INFO)] $1"
+    >/dev/stderr echo "[$(green INFO)] $1"
 }
 
 # Print a full-width separator.
@@ -33,19 +33,19 @@ sep() {
     fi
     SEP=$(yes = | tr -d "\n" | head -c $(($COLUMNS - 1)))
     if [ -z "$1" ]; then
-        echo >/dev/stderr $SEP
+        >/dev/stderr echo $SEP
     else
         MSGLEN=$(echo "$1" | wc -c)
         if [ $(($MSGLEN + 4)) -gt $COLUMNS ]; then
-            echo >/dev/stderr "$SEP"
-            echo >/dev/stderr "$1"
-            echo >/dev/stderr "$SEP"
+            >/dev/stderr echo "$SEP"
+            >/dev/stderr echo "$1"
+            >/dev/stderr echo "$SEP"
         else
             LEFTLEN=$((($COLUMNS - $MSGLEN - 2) / 2))
             RIGHTLEN=$(($COLUMNS - $MSGLEN - 2 - $LEFTLEN))
             LEFTSEP=$(echo $SEP | head -c $LEFTLEN)
             RIGHTSEP=$(echo $SEP | head -c $RIGHTLEN)
-            echo >/dev/stderr "$LEFTSEP $1 $RIGHTSEP"
+            >/dev/stderr echo "$LEFTSEP $1 $RIGHTSEP"
         fi
     fi
 }
diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh
index 6bc7a20c..8a4248c4 100644
--- a/prepare-vms/lib/commands.sh
+++ b/prepare-vms/lib/commands.sh
@@ -72,10 +72,10 @@ _cmd_deploy() {
     # wait until all hosts are reachable before trying to deploy
     info "Trying to reach $TAG instances..."
     while ! tag_is_reachable $TAG; do
-        echo >/dev/stderr -n "."
+        >/dev/stderr echo -n "."
         sleep 2
     done
-    echo >/dev/stderr ""
+    >/dev/stderr echo ""
 
     sep "Deploying tag $TAG"
     pssh -I tee /tmp/settings.yaml <$SETTINGS
diff --git a/prepare-vms/lib/pssh.sh b/prepare-vms/lib/pssh.sh
index 9c4c0ea9..cf13f48b 100644
--- a/prepare-vms/lib/pssh.sh
+++ b/prepare-vms/lib/pssh.sh
@@ -6,7 +6,7 @@ pssh() {
     HOSTFILE="ips.txt"
 
     [ -f $HOSTFILE ] || {
-        echo >/dev/stderr "No hostfile found at $HOSTFILE"
+        >/dev/stderr echo "No hostfile found at $HOSTFILE"
         return
     }