From 8a6a7ed83ad358afaea375d98b68b630ab1df829 Mon Sep 17 00:00:00 2001
From: AJ ONeal <awesome@coolaj86.com>
Date: Thu, 15 Jan 2015 15:52:35 -0700
Subject: [PATCH] better output

---
 setup-deps-mavericks.bash | 13 +++++++------
 setup-deps-ubuntu.bash    |  9 +++++++++
 setup.bash                | 24 ++++++------------------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/setup-deps-mavericks.bash b/setup-deps-mavericks.bash
index 7415946..b232b01 100644
--- a/setup-deps-mavericks.bash
+++ b/setup-deps-mavericks.bash
@@ -5,6 +5,13 @@ NO_FAIL2BAN=${1}
 
 echo ""
 echo ""
+echo "Checking for"
+echo ""
+echo "    * XCode Command Line Tools"
+echo "    * wget"
+echo "    * pkg-config"
+echo "    * jshint"
+echo ""
 
 # XCode
 # testing for which git, gcc, etc will not work because the tools are aliased to the install script
@@ -31,8 +38,6 @@ if [ -z "$(xcode-select --print-path 2>/dev/null)" ] || [ -z "$(git --version 2>
   echo "It looks like the other install is finishing up."
   echo "This installation will begin in one minute."
   sleep 60
-else
-  echo "XCode Command Line Tools already installed"
 fi
 
 # homebrew
@@ -48,8 +53,6 @@ fi
 if [ -z "$(which wget | grep wget)" ]; then
   echo "installing wget..."
   brew install wget
-else
-  echo "wget already installed"
 fi
 
 # http://www.fail2ban.org/wiki/index.php/HOWTO_Mac_OS_X_Server_(10.5)
@@ -64,6 +67,4 @@ fi
 if [ -z "$(which pkg-config | grep pkg-config)" ]; then
   echo "installing pkg-config..."
   brew install pkg-config
-else
-  echo "pkg-config already installed"
 fi
diff --git a/setup-deps-ubuntu.bash b/setup-deps-ubuntu.bash
index cd68b75..fbd3e31 100644
--- a/setup-deps-ubuntu.bash
+++ b/setup-deps-ubuntu.bash
@@ -6,6 +6,15 @@ NO_FAIL2BAN=${1}
 
 echo ""
 echo ""
+echo "Checking for"
+echo ""
+echo "    * build-essential"
+echo "    * rsync"
+echo "    * wget"
+echo "    * curl"
+echo "    * pkg-config"
+echo "    * jshint"
+echo ""
 
 echo "updating apt-get..."
 sudo bash -c "apt-get update -qq -y < /dev/null" > /dev/null
diff --git a/setup.bash b/setup.bash
index f30d9e0..9deb3f4 100644
--- a/setup.bash
+++ b/setup.bash
@@ -138,7 +138,7 @@ esac
 # Download installers #
 #######################
 
-echo "${OS}" "${ARCH}"
+echo "Preparing to install io.js (and common development dependencies) for ${OS}" "${ARCH}"
 
 if [ -n "$(which curl)" ]; then
   curl --silent "${BASE_URL}/setup-deps-${SETUP_FILE}.bash" \
@@ -210,24 +210,15 @@ if [ -z "$IOJS_VER" ]; then
   IOJS_VER="v1.0.1"
 fi
 
-if [ -n "$(which iojs 2>/dev/null || false)" ]; then
-  echo ""
-  echo "HEY, LISTEN:"
-  echo "io.js is already install as iojs $(iojs -v | grep v)"
-  echo ""
-  echo "to reinstall please first run:"
-  echo "sudo mv '$(which iojs)' '$(which iojs).$(iojs -v)'"
-  echo ""
-fi
-
 #
 # iojs  
 #
 if [ -n "$(which iojs | grep iojs 2>/dev/null)" ]; then
 # iojs of some version is already installed
   if [ "${IOJS_VER}" == "$(iojs -v 2>/dev/null)" ]; then
-    echo iojs ${IOJS_VER} already installed
+    echo iojs ${IOJS_VER} is already installed
   else
+    echo ""
     echo "HEY, LISTEN:"
     echo ""
     echo "io.js is already installed as iojs $(iojs -v | grep v)"
@@ -238,8 +229,6 @@ if [ -n "$(which iojs | grep iojs 2>/dev/null)" ]; then
   IOJS_VER=""
 elif [ "$(node -v 2>/dev/null)" != "$(iojs -v 2>/dev/null)" ]; then
 # node of some version is already installed
-  echo ""
-  echo "################################################################################"
   echo ""
   echo "HEY, LISTEN!"
   echo ""
@@ -247,10 +236,11 @@ elif [ "$(node -v 2>/dev/null)" != "$(iojs -v 2>/dev/null)" ]; then
   echo "Backing up $(which node) as $(which node).$(node -v)"
   echo "(copy it back after the install if to maintain node.js and io.js separately)"
   echo ""
-  echo sudo mv "$(which node)" "$(which node).$(node -v)"
   sleep 3
-  sudo mv "$(which node)" "$(which node).$(node -v)"
   echo "################################################################################"
+  echo sudo mv "$(which node)" "$(which node).$(node -v)"
+  echo "################################################################################"
+  sudo mv "$(which node)" "$(which node).$(node -v)"
   echo ""
 fi
 
@@ -262,8 +252,6 @@ fi
 if [ -z "$(which jshint | grep jshint)" ]; then
   echo "installing jshint..."
   npm install --silent jshint -g > /dev/null
-else
-  echo "jshint already installed"
 fi
 
 echo ""