From e5ab9204858c3870e7ea603b678e7ba2d83beedd Mon Sep 17 00:00:00 2001
From: Bruno Tavares <bruno.exz@gmail.com>
Date: Thu, 20 Feb 2014 16:54:29 -0300
Subject: [PATCH] Add context information to info and commands

---
 kickstart/recipes/kickstart.sh         | 12 +++++++++---
 kickstart/recipes/kickstart/package.sh |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/kickstart/recipes/kickstart.sh b/kickstart/recipes/kickstart.sh
index fa9bfc5..af8d4a3 100644
--- a/kickstart/recipes/kickstart.sh
+++ b/kickstart/recipes/kickstart.sh
@@ -7,18 +7,24 @@ kickstart.codename() {
 }
 
 kickstart.info() {
-  echo $@ >&2
+  [ "$kickstart_context" ] && echo "$kickstart_context >> $@" >&2 || echo "$@" >&2
+}
+
+kickstart.context() {
+  kickstart_context=""
+  kickstart.info "Setting up $@"
+  kickstart_context="$@"
 }
 
 kickstart.mute() {
-  echo "Running \"$@\""
+  kickstart.info "Running \"$@\""
   `$@ >/dev/null 2>&1`
   return $?
 }
 
 kickstart.add_to_profile.d() {
   file=$1
-  [ ! -f files/$file ] && echo "File files/$file not found" && exit 1
+  [ ! -f files/$file ] && kickstart.info "File files/$file not found" && exit 1
 
   cp files/$file /etc/profile.d/$file
   grep -q $file /etc/zshenv 2>&1 || ( echo "[[ -f /etc/profile.d/$file ]] && source /etc/profile.d/$file" >> /etc/zshenv )
diff --git a/kickstart/recipes/kickstart/package.sh b/kickstart/recipes/kickstart/package.sh
index c23ed62..a263653 100644
--- a/kickstart/recipes/kickstart/package.sh
+++ b/kickstart/recipes/kickstart/package.sh
@@ -6,7 +6,7 @@ elif which yum >/dev/null 2>&1; then
 fi
 
 if [ "$kickstart_pkg" = '' ]; then
-  echo 'kickstart only supports apt-get or yum!' >&2
+  kickstart.info 'kickstart only supports apt-get or yum!'
   exit 1
 fi
 
@@ -21,10 +21,10 @@ kickstart.package.installed() {
 
 kickstart.package.install() {
   if kickstart.package.installed "$@"; then
-    echo "$@ already installed"
+    kickstart.info "$@ already installed"
     return 1
   else
-    echo "No packages found matching $@. Installing..."
+    kickstart.info "No packages found matching $@. Installing..."
     kickstart.mute "$kickstart_pkg -y install $@"
     return 0
   fi