New script template

README.md

@@ -19,9 +19,26 @@ This is the centralized repository of all my personal shell scripts which I use
 ## Usage
 Each of the directories has its own README file which describes in more depth how to use the script(s) contained within.  Most of the scripts here won't work without the scripting utilities in `lib/`.
 
+## Versioning
+
+This project implements the Semantic Versioning guidelines.
+
+Releases will be numbered with the following format:
+
+`<major>.<minor>.<patch>`
+
+And constructed with the following guidelines:
+
+* Breaking backward compatibility bumps the major (and resets the minor and patch)
+* New additions without breaking backward compatibility bumps the minor (and resets the patch)
+* Bug fixes and misc changes bumps the patch
+
+For more information on SemVer, please visit [SemVer][7].
+
 [1]: http://brew.sh
 [2]: http://caskroom.io
 [3]: https://github.com/lra/mackup
 [4]: https://rvm.io
 [5]:http://en.wikipedia.org/wiki/Rsync
-[6]: http://www.cis.upenn.edu/~bcpierce/unison/
+[6]: http://www.cis.upenn.edu/~bcpierce/unison/
+[7]: http://semver.org

etc/.gitignore

@@ -2,4 +2,4 @@
 
 !.gitignore
 !README.md
-!pushover.cfg.sample
+!*.sample

lib/parseOpts.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-
+##################################################
-
 # Parse commandline options
 #
+#  Version 1.0.0
+#
 #  Works in along  with the 'Command Line Options' and 'Set Switches' functions
 #  of many of my scripts
 #

lib/setupScriptFunctions.sh

@@ -3,8 +3,11 @@
 # ##################################################
 # Shared bash functions used by my mac setup scripts.
 #
+# VERSION 1.0.0
+#
 # HISTORY
-# * 2015-01-02 - Initial creation
+#
+# * 2015-01-02 - v1.0.0  - First Creation
 #
 # ##################################################
 
@@ -17,33 +20,29 @@
 hasHomebrew () {
   # Check for Homebrew
   if type_not_exists 'brew'; then
-    e_error "No Homebrew. Gots to install it."
+    warning "No Homebrew. Gots to install it."
     seek_confirmation "Install Homebrew?"
     if is_confirmed; then
       #   Ensure that we can actually, like, compile anything.
       if [[ ! "$(type -P gcc)" && "$OSTYPE" =~ ^darwin ]]; then
-        e_error "XCode or the Command Line Tools for XCode must be installed first."
+        notice "XCode or the Command Line Tools for XCode must be installed first."
         seek_confirmation "Install Command Line Tools from here?"
         if is_confirmed; then
           xcode-select --install
         else
-          e_error "Please come back after Command Line Tools are installed.  Exiting"
+          die "Please come back after Command Line Tools are installed."
-          exit 1
         fi
       fi
       # Check for Git
       if type_not_exists 'git'; then
-        e_error "Git should be installed. It isn't. Aborting."
+        die "Git should be installed. It isn't. Aborting."
-        exit 1
       fi
       # Install Homebrew
       ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
       brew tap homebrew/dupes
       brew tap homebrew/versions
     else
-      e_error "Without Homebrew installed we won't get very far."
+      die "Without Homebrew installed we won't get very far."
-      e_error "Exiting"
-      exit 0
     fi
   fi
 }
@@ -141,7 +140,7 @@ function doInstall () {
       done
     fi
   else
-    e_success "Nothing to install. You've already got them all."
+    success "Nothing to install. You've already got them all."
   fi
 }
 
@@ -155,18 +154,18 @@ brewCleanup () {
 
   # htop
   if [[ "$(type -P $binroot/htop)" && "$(stat -L -f "%Su:%Sg" "$binroot/htop")" != "root:wheel" || ! "$(($(stat -L -f "%DMp" "$binroot/htop") & 4))" ]]; then
-    e_header "Updating htop permissions"
+    header "Updating htop permissions"
     sudo chown root:wheel "$binroot/htop"
     sudo chmod u+s "$binroot/htop"
   fi
   if [[ "$(type -P $binroot/bash)" && "$(cat /etc/shells | grep -q "$binroot/bash")" ]]; then
-    e_header "Adding $binroot/bash to the list of acceptable shells"
+    header "Adding $binroot/bash to the list of acceptable shells"
     echo "$binroot/bash" | sudo tee -a /etc/shells >/dev/null
   fi
   if [[ "$SHELL" != "$binroot/bash" ]]; then
-    e_header "Making $binroot/bash your default shell"
+    header "Making $binroot/bash your default shell"
     sudo chsh -s "$binroot/bash" "$USER" >/dev/null 2>&1
-    e_success "Please exit and restart all your shells."
+    success "Please exit and restart all your shells."
   fi
   brew cleanup
 }
@@ -178,9 +177,9 @@ brewCleanup () {
 # ------------------------------------------------------
 hasDropbox () {
   # Confirm we have Dropbox installed
-  e_arrow "Confirming that Dropbox is installed..."
+  notice "Confirming that Dropbox is installed..."
   if [ ! -e /Applications/Dropbox.app ]; then
-    e_error "We don't have Dropbox.  Let's get it installed."
+    notice "We don't have Dropbox.  Let's get it installed."
     seek_confirmation "Install Dropbox and all necessary prerequisites?"
     if is_confirmed; then
       # Run functions
@@ -196,10 +195,9 @@ hasDropbox () {
       Install
       open -a dropbox
     else
-      e_error "Can't run this script.  Install Dropbox manually.  Exiting."
+      die "Can't run this script.  Install Dropbox manually."
-      exit 0
     fi
   else
-    e_success "Dropbox is installed."
+    success "Dropbox is installed."
   fi
 }

lib/sharedFunctions.sh

@@ -3,20 +3,30 @@
 # ##################################################
 # Shared bash functions used by my bash scripts.
 #
+# VERSION 1.0.0
+#
 # HISTORY
-# * 2015-01-02 - Initial creation
+#
+# * 2015-01-02 - v1.0.0  - First Creation
 #
 # ##################################################
 
-# scriptPath
+# Traps
 # ------------------------------------------------------
-# This function will populate the variable SOURCEPATH with the
+# These functions are for use with different trap scenarios
-# full path of the script being run.
-# Note: The function must be run within the script before using
-# the variable
 # ------------------------------------------------------
-function scriptPath() {
+
-  SCRIPTPATH=$( cd "$( dirname "$0" )" && pwd )
+# Non destructive exit for when script exits naturally.
+# Usage: Add this function at the end of every script
+function safeExit() {
+  # Delete temp files, if any
+  if is_not_empty "${tmpDir}"; then
+    if is_dir "${tmpDir}"; then
+      rm -r "${tmpDir}"
+    fi
+  fi
+  trap - INT TERM EXIT
+  exit
 }
 
 # readFile
@@ -34,6 +44,10 @@ function readFile() {
   done < "$1"
 }
 
+# Escape a string
+# ------------------------------------------------------
+escape() { echo $@ | sed 's/\//\\\//g'; }
+
 # needSudo
 # ------------------------------------------------------
 # If a script needs sudo access, call this function which
@@ -45,16 +59,6 @@ function needSudo() {
   while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
 }
 
-# die
-# ------------------------------------------------------
-# "die function" - used to denote a failed action in a script.
-# usage:  cd some/path || die "cd failed"
-# ------------------------------------------------------
-die() {
-  e_error "FATAL ERROR: $* (status $?)" 1>&2
-  exit 1
-}
-
 # convertsecs
 # ------------------------------------------------------
 # Convert Seconds to human readable time
@@ -86,7 +90,7 @@ function convertsecs() {
 function pushover() {
   # Check for config file containing API Keys
   if [ ! -f "../etc/pushover.cfg" ]; then
-   e_error "Please locate the pushover.cfg to send notifications to Pushover."
+   error "Please locate the pushover.cfg to send notifications to Pushover."
   else
     # Grab variables from the config file
     source "../etc/pushover.cfg"
@@ -243,22 +247,16 @@ function is_os() {
 
 # Ask the question
 function seek_confirmation() {
+force=0
   echo ""
-  e_bold "$@"
+  input "$@"
-  read -p " (y/n) " -n 1
-  echo ""
-}
-
-# same as above but underlined
-function seek_confirmation_head() {
-  echo ""
-  e_underline "$@"
   read -p " (y/n) " -n 1
   echo ""
 }
 
 # Test whether the result of an 'ask' is a confirmation
 function is_confirmed() {
+  (($force)) && return 0;
   if [[ "$REPLY" =~ ^[Yy]$ ]]; then
     return 0
   fi
@@ -310,7 +308,7 @@ function unmountDrive() {
 
 function help () {
   echo "" 1>&2
-  e_bold "   ${@}" 1>&2
+  input "   ${@}" 1>&2
   if [ -n "${usage}" ]; then # print usage information if available
     echo "   ${usage}" 1>&2
   fi

lib/sharedVariables.sh

@@ -3,8 +3,11 @@
 # ##################################################
 # Shared bash functions used by my bash scripts.
 #
+# VERSION 1.0.0
+#
 # HISTORY
-# * 2015-01-02 - Initial creation
+#
+# * 2015-01-02 - v1.0.0  - First Creation
 #
 # ##################################################
 
@@ -12,18 +15,19 @@
 # ------------------------------------------------------
 # Will return the name of the script being run
 # ------------------------------------------------------
-SCRIPTNAME=`basename $0` #Set Script Name variable
+scriptName=`basename $0` #Set Script Name variable
+scriptBasename="$(basename ${scriptName} .sh)" # Strips '.sh' from scriptName
 
 # NOW
 # ------------------------------------------------------
 # Will print the current date and time in the format:
 # 01-02-2015 01:09:54 PM
 # ------------------------------------------------------
-NOW=$(date +"%m-%d-%Y %r") #Set Timestamp in variable
+now=$(date +"%m-%d-%Y %r") #Set Timestamp in variable
 
 # THISHOST
 # ------------------------------------------------------
 # Will print the current hostname of the computer the script
 # is being run on.
 # ------------------------------------------------------
-THISHOST=$(hostname)
+thisHost=$(hostname)

lib/utils.sh

@@ -1,5 +1,20 @@
 #!/usr/bin/env bash
 
+# ##################################################
+# Bash scripting Utilities.
+#
+# VERSION 1.0.0
+#
+# This script sources my collection of scripting utilities making
+# it possible to source this one script and gain access to a
+# complete collection of functions, variables, and other options.
+#
+# HISTORY
+#
+# * 2015-01-02 - v1.0.0  - First Creation
+#
+# ##################################################
+
 
 # Source additional files
 # ------------------------------------------------------
@@ -26,18 +41,19 @@ FILES="
 # Source the Utility Files
 for file in $FILES
 do
-  if [ -f "${SOURCE}PATH/${file}" ]; then
+  if [ -f "${SOURCEPATH}/${file}" ]; then
-    source "${SOURCE}PATH/${file}"
+    source "${SOURCEPATH}/${file}"
   else
-    e_error "${file} does not exist.  Exiting"
+    error "${file} does not exist.  Exiting"
     Exit 1
   fi
 done
 
+
 # Logging and Colors
 # ------------------------------------------------------
 # Here we set the colors for our script feedback.
-# Example usage: e_success "sometext"
+# Example usage: success "sometext"
 #------------------------------------------------------
 
 # Set Colors
@@ -50,20 +66,60 @@ green=$(tput setaf 76)
 tan=$(tput setaf 3)
 blue=$(tput setaf 38)
 
-# Headers and  Logging
+function _alert() { #my function
-e_header() { echo -e "\n${bold}${purple}==========  $@  ==========${reset}\n" ; }
+  if [ "${1}" = "emergency" ]; then
-e_arrow() { echo -e "➜ $@" ; }
+    local color="${bold}${red}"
-e_success() { echo -e "${green}✔ $@${reset}" ; }
+  fi
-e_error() { echo -e "${red}✖ $@${reset}" ; }
+  if [ "${1}" = "error" ] || [ "${1}" = "warning" ]; then
-e_warning() { echo -e "${tan}➜ $@${reset}" ; }
+    local color="${red}"
-e_underline() { echo -e "${underline}${bold}$@${reset}" ; }
+  fi
-e_bold() { echo -e "${bold}$@${reset}" ; }
+  if [ "${1}" = "success" ]; then
-e_note() { echo -e "${underline}${bold}${blue}Note:${reset}  ${blue}$@${reset}" ; }
+    local color="${green}"
+  fi
+  if [ "${1}" = "debug" ]; then
+    local color="${purple}"
+  fi
+  if [ "${1}" = "header" ]; then
+    local color="${bold}""${purple}"
+  fi
+  if [ "${1}" = "input" ]; then
+    local color="${bold}"
+    _printLog="0" # Don't print to $logFile
+  fi
+  if [ "${1}" = "info" ] || [ "${1}" = "notice" ]; then
+    local color="" # Us terminal default color
+  fi
+  # Don't use colors on pipes or non-recognized terminals
+  if [[ "${TERM}" != "xterm"* ]] || [ -t 1 ]; then
+    color=""; reset=""
+  fi
+
+  # Print to $logFile
+  if [[ "${printLog}" = "1" ]]; then
+    echo -e "$(date +"%m-%d-%Y %r") $(printf "[%9s]" ${1}) "${_message}"" >> $logFile;
+  fi
+
+  # Print to console when script is not 'quiet'
+  ((quiet)) && return || echo -e "$(date +"%r") ${color}$(printf "[%9s]" ${1}) "${_message}"${reset}";
+
+}
+
+function die ()       { local _message="${@} Exiting."; echo "$(_alert emergency)"; exit 1;}
+function error ()     { local _message="${@}"; echo "$(_alert error)"; }
+function warning ()   { local _message="${@}"; echo "$(_alert warning)"; }
+function notice ()    { local _message="${@}"; echo "$(_alert notice)"; }
+function info ()      { local _message="${@}"; echo "$(_alert info)"; }
+function debug ()     { local _message="${@}"; echo "$(_alert debug)"; }
+function success ()   { local _message="${@}"; echo "$(_alert success)"; }
+function input()      { local _message="${@}"; echo "$(_alert input)"; }
+function header()     { local _message="========== ${@} ==========  "; echo "$(_alert header)"; }
+
+# Log messages when verbose is set to "1"
+verbose() { (($verbose)) && info "$@"; }
 
 
-
+# Notes to self
-
+# ####################
-# Note to self
 # This is how you create a variable with multiple lines
 # read -d '' String <<"EOF"
 #   one
@@ -72,3 +128,9 @@ e_note() { echo -e "${underline}${bold}${blue}Note:${reset}  ${blue}$@${reset}"
 #   four
 # EOF
 # echo ${String}
+#
+#   # How to get a script name
+# scriptLocation="${0}"
+# scriptFile="${scriptLocation##*/}"
+# scriptName="${scriptFile%.*}"
+# echo "${scriptName}"

scriptTemplate.sh

@@ -0,0 +1,209 @@
+#!/usr/bin/env bash
+
+
+
+# ##################################################
+# My Generic sync script.
+#
+version="1.0.0"  # Sets variable
+#
+# This is my bash script template.  Start all scripts
+# with this
+#
+# HISTORY:
+#
+# * 2015-01-04 - v1.0.0  - First Creation
+#
+# ##################################################
+
+# Source Scripting Utilities
+# -----------------------------------
+# If these can't be found, update the path to the file
+# -----------------------------------
+if [ -f "lib/utils.sh" ]; then
+  source "lib/utils.sh"
+else
+  echo "Please find the file util.sh and add a reference to it in this script. Exiting."
+  exit 1
+fi
+
+# trapCleanup Function
+# -----------------------------------
+# Any actions that should be taken if the script is prematurely
+# exited.  Always call this function at the top of your script.
+# -----------------------------------
+function trapCleanup() {
+  echo ""
+  if is_not_empty "${tmpDir}"; then
+    if is_dir "${tmpDir}"; then
+      rm -r "${tmpDir}"
+    fi
+  fi
+  die "Exit trapped."  # Edit this if you like.
+}
+
+# Set Flags
+# -----------------------------------
+# Flags which can be overridden by user input.
+# Default values are below
+# -----------------------------------
+quiet=0
+printLog=1
+verbose=0
+force=0
+strict=0
+args=()
+
+# Set Local Variables
+# -----------------------------------
+# A set of variables used by many scripts
+# -----------------------------------
+
+# Set Script name and location variables
+scriptName=`basename ${0}`  # Full name
+scriptBasename="$(basename ${scriptName} .sh)" # Strips '.sh' from name
+scriptPath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Set time stamp
+now=$(date +"%m-%d-%Y %r")
+# Set hostname
+thisHost=$(hostname)
+
+# Create temp directory with three random numbers and the process ID
+# in the name.  This directory is removed automatically at exit.
+  tmpDir="/tmp/${scriptName}.$RANDOM.$RANDOM.$RANDOM.$$"
+  (umask 077 && mkdir "${tmpDir}") || {
+    die "Could not create temporary directory! Exiting."
+  }
+
+# Logging
+# -----------------------------------
+# Defaults to 'dev/null'. If you want a log,
+# place the path here.
+# -----------------------------------
+logFile="/dev/null"
+
+
+function mainScript() {
+############## Begin Script Here ###################
+
+
+
+echo -n
+
+
+
+############## End Script Here ###################
+}
+
+############## Begin Options and Usage ###################
+
+
+# Print usage
+usage() {
+  echo -n "${scriptName} [OPTION]... [FILE]...
+
+This is my script template.
+
+ Options:
+  -u, --username    Username for script
+  -p, --password    Input user password, it's recommended to insert
+                    this through the interactive option
+  -f, --force       Skip all user interaction.  Implied 'Yes' to all actions
+  -q, --quiet       Quiet (no output)
+  -s, --strict      Exit script with null variables.  'set -o nounset'
+  -v, --verbose     Output more information. (Items echoed to 'verbose')
+  -h, --help        Display this help and exit
+      --version     Output version information and exit
+"
+}
+
+# Iterate over options breaking -ab into -a -b when needed and --foo=bar into
+# --foo bar
+optstring=h
+unset options
+while (($#)); do
+  case $1 in
+    # If option is of type -ab
+    -[!-]?*)
+      # Loop over each character starting with the second
+      for ((i=1; i < ${#1}; i++)); do
+        c=${1:i:1}
+
+        # Add current char to options
+        options+=("-$c")
+
+        # If option takes a required argument, and it's not the last char make
+        # the rest of the string its argument
+        if [[ $optstring = *"$c:"* && ${1:i+1} ]]; then
+          options+=("${1:i+1}")
+          break
+        fi
+      done
+      ;;
+    # If option is of type --foo=bar
+    --?*=*) options+=("${1%%=*}" "${1#*=}") ;;
+    # add --endopts for --
+    --) options+=(--endopts) ;;
+    # Otherwise, nothing special
+    *) options+=("$1") ;;
+  esac
+  shift
+done
+set -- "${options[@]}"
+unset options
+
+# Print help if no arguments were passed.
+# Uncomment to force arguments when invoking the script
+# [[ $# -eq 0 ]] && set -- "--help"
+
+# Read the options and set stuff
+while [[ $1 = -?* ]]; do
+  case $1 in
+    -h|--help) usage >&2; safeExit ;;
+    --version) echo "$(basename $0) $version"; safeExit ;;
+    -u|--username) shift; username=$1 ;;
+    -p|--password) shift; password=$1 ;;
+    -v|--verbose) verbose=1 ;;
+    -q|--quiet) quiet=1 ;;
+    -s|--strict) strict=1;;
+    -f|--force) force=1 ;;
+    --endopts) shift; break ;;
+    *) die "invalid option: '$1'." ;;
+  esac
+  shift
+done
+
+
+############## End Options and Usage ###################
+
+
+
+
+# ############# ############# #############
+# ##       TIME TO RUN THE SCRIPT        ##
+# ##                                     ##
+# ## You shouldn't need to edit anything ##
+# ## beneath this line                   ##
+# ##                                     ##
+# ############# ############# #############
+
+# Trap bad exits with your cleanup function
+trap trapCleanup INT TERM
+
+# Exit on error. Append ||true if you expect an error.
+set -o errexit
+
+# Exit on empty variable
+if [ "${strict}"="1" ]; then
+  set -o nounset
+fi
+
+# Bash will remember & return the highest exitcode in a chain of pipes.
+# This way you can catch the error in case mysqldump fails in `mysqldump |gzip`
+set -o pipefail
+
+
+mainScript # Run your script
+
+safeExit # Exit cleanly

setupScripts/fileTest.sh

@@ -21,14 +21,14 @@ fi
 if is_not_file "$TESTFILE"; then
   die "Could not find $TESTFILE.  Exiting."
 else
-  e_arrow "Confirming that Dropbox has synced..."
+  notice "Confirming that Dropbox has synced..."
   while IFS= read -r file
   do
     while [ ! -e $HOME/"$file" ] ;
     do
-      e_warning "Waiting for Dropbox to Sync files."
+      notice "Waiting for Dropbox to Sync files."
       sleep 10
     done
-    e_success "Found $file"
+    success "Found $file"
   done < "$TESTFILE"
 fi

setupScripts/mackup.sh

@@ -41,55 +41,50 @@ hasDropbox
 if is_not_file "$TESTFILE"; then
   die "Could not find $TESTFILE.  Exiting."
 else
-  e_arrow "Confirming that Dropbox has synced..."
+  notice "Confirming that Dropbox has synced..."
   while IFS= read -r file
   do
     while [ ! -e $HOME/"$file" ] ;
     do
-      e_warning "Waiting for Dropbox to Sync files."
+      notice "Waiting for Dropbox to Sync files."
       sleep 10
     done
   done < "$TESTFILE"
 fi
 
 #Add some additional time just to be sure....
-e_warning "Waiting for Dropbox to Sync files."
+notice "Waiting for Dropbox to Sync files."
 sleep 10
-e_warning "Waiting for Dropbox to Sync files."
+notice "Waiting for Dropbox to Sync files."
 sleep 10
-e_warning "Waiting for Dropbox to Sync files."
+notice "Waiting for Dropbox to Sync files."
-sleep 10
-e_warning "Waiting for Dropbox to Sync files."
-sleep 10
-e_warning "Waiting for Dropbox to Sync files."
 sleep 10
 
 # Sync Complete
-e_success "Hooray! Dropbox has synced the necessary files."
+success "Hooray! Dropbox has synced the necessary files."
 
 if type_not_exists 'mackup'; then
-  e_error "MACKUP NOT FOUND."
+  info "Run 'brew install mackup' or run the Homebrew setup script."
-  e_error "Run 'brew install mackup' or run the Homebrew setup script. Exiting."
+  die "MACKUP NOT FOUND."
-  exit 0
 fi
 
 # upgrade mackup.  Don't display in terminal
 brew upgrade mackup >/dev/null 2>&1
 
-e_arrow "Checking for Mackup config files..."
+notice "Checking for Mackup config files..."
 if is_not_symlink ""$HOME"/.mackup"; then
   ln -s "$MACKUPDIR"/.mackup "$HOME"/.mackup
 fi
 if is_not_symlink ""$HOME"/.mackup.cfg"; then
   ln -s "$MACKUPDIR"/.mackup.cfg "$HOME"/.mackup.cfg
 fi
-e_success "Mackup config files linked."
+success "Mackup config files linked."
 
 seek_confirmation "Run Mackup Restore?"
 if is_confirmed; then
   mackup restore
-  e_header "All Done."
+  header "All Done."
 else
-  e_arrow "Exiting"
+  notice "Exiting"
   exit 0
 fi

setupScripts/newMacSetup.sh

@@ -23,10 +23,10 @@ if is_confirmed; then
 	if is_file "./dropbox.sh"; then
 		./dropbox.sh
 	else
-		e_error "Can't find dropbox.sh"
+		error "Can't find dropbox.sh"
 		seek_confirmation "Continue running other scripts?"
 		if is_not_confirmed; then
-			e_error "Exiting"
+			warning "Exiting."
 			exit 0
 		fi
 	fi
@@ -49,8 +49,7 @@ if is_confirmed; then
 		if is_file "$file"; then
 			$file
 		else
-			e_error "$file does not exist. Exiting"
+			die "$file does not exist. Exiting"
-			exit 0
 		fi
 	done
 else
@@ -61,7 +60,7 @@ for file in $FILES
 			if is_file "$file"; then
 				$file
 			else
-				e_error "$file does not exist."
+				die "$file does not exist."
 			fi
 		fi
 	done

setupScripts/osx.sh

@@ -12,12 +12,12 @@ fi
 # Grant sudo privs.
 needSudo
 
-e_header  "Beginning osx.sh"
+header  "Beginning osx.sh"
-e_note "This script runs a series of commands to pre-configure OSX."
+info "This script runs a series of commands to pre-configure OSX."
 
 seek_confirmation "Would you like to set your computer name (as done via System Preferences >> Sharing)?  (y/n)"
 if is_confirmed; then
-  e_arrow "What would you like the name to be?"
+  input "What would you like the name to be?"
   read COMPUTER_NAME
   sudo scutil --set ComputerName "$COMPUTER_NAME"
   sudo scutil --set HostName "$COMPUTER_NAME"
@@ -32,10 +32,10 @@ fi
 seek_confirmation "Run General UI Tweaks?"
 if is_confirmed; then
 
-	e_success "Disabled Sound Effects on Boot"
+	success "Disabled Sound Effects on Boot"
 	sudo nvram SystemAudioVolume=" "
 
-	e_success "Hide the Time Machine, Volume, User, and Bluetooth icons"
+	success "Hide the Time Machine, Volume, User, and Bluetooth icons"
     # Get the system Hardware UUID and use it for the next menubar stuff
     for domain in ~/Library/Preferences/ByHost/com.apple.systemuiserver.*; do
         defaults write "${domain}" dontAutoLoad -array \
@@ -50,77 +50,77 @@ if is_confirmed; then
       "/System/Library/CoreServices/Menu Extras/Battery.menu" \
       "/System/Library/CoreServices/Menu Extras/Clock.menu"
 
-	e_success "Set highlight color to yellow"
+	success "Set highlight color to yellow"
 	defaults write NSGlobalDomain AppleHighlightColor -string '0.984300 0.929400 0.450900'
 
-	e_success "Set sidebar icon size to small"
+	success "Set sidebar icon size to small"
 	defaults write NSGlobalDomain NSTableViewDefaultSizeMode -int 1
 	# Possible values for int: 1=small, 2=medium
 
-	e_success "Always show scrollbars"
+	success "Always show scrollbars"
 	defaults write NSGlobalDomain AppleShowScrollBars -string "Always"
 	# Possible values: `WhenScrolling`, `Automatic` and `Always`
 
-	#e_success "Disable transparency in the menu bar and elsewhere on Yosemite"
+	#success "Disable transparency in the menu bar and elsewhere on Yosemite"
 	#defaults write com.apple.universalaccess reduceTransparency -bool true
 
-	e_success "Disable opening and closing window animations"
+	success "Disable opening and closing window animations"
 	defaults write NSGlobalDomain NSAutomaticWindowAnimationsEnabled -bool false
 
-	e_success "Expand save panel by default"
+	success "Expand save panel by default"
 	defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode -bool true
 
-	e_success "Expand print panel by default"
+	success "Expand print panel by default"
 	defaults write NSGlobalDomain PMPrintingExpandedStateForPrint -bool true
 	defaults write NSGlobalDomain PMPrintingExpandedStateForPrint2 -bool true
 
-	e_success "Save to disk (not to iCloud) by default"
+	success "Save to disk (not to iCloud) by default"
 	defaults write NSGlobalDomain NSDocumentSaveNewDocumentsToCloud -bool false
 
-	e_success "Automatically quit printer app once the print jobs complete"
+	success "Automatically quit printer app once the print jobs complete"
 	defaults write com.apple.print.PrintingPrefs "Quit When Finished" -bool true
 
-	e_success "Disable the Are you sure you want to open this application? dialog"
+	success "Disable the Are you sure you want to open this application? dialog"
 	defaults write com.apple.LaunchServices LSQuarantine -bool false
 
-	e_success "General:Display ASCII control characters using caret notation in standard text views"
+	success "General:Display ASCII control characters using caret notation in standard text views"
 	# Try e.g. `cd /tmp; unidecode "\x{0000}" > cc.txt; open -e cc.txt`
 	defaults write NSGlobalDomain NSTextShowsControlCharacters -bool true
 
-	e_success "Disable automatic termination of inactive apps"
+	success "Disable automatic termination of inactive apps"
 	defaults write NSGlobalDomain NSDisableAutomaticTermination -bool true
 
-	e_success "Disable Resume system-wide"
+	success "Disable Resume system-wide"
 	defaults write com.apple.systempreferences NSQuitAlwaysKeepsWindows -bool false
 
-	e_success "Set Help Viewer windows to non-floating mode"
+	success "Set Help Viewer windows to non-floating mode"
 	defaults write com.apple.helpviewer DevMode -bool true
 
-	e_success "Reveal info when clicking the clock in the login window"
+	success "Reveal info when clicking the clock in the login window"
 	sudo defaults write /Library/Preferences/com.apple.loginwindow AdminHostInfo HostName
 
-	#e_success "Restart automatically if the computer freezes"
+	#success "Restart automatically if the computer freezes"
 	#systemsetup -setrestartfreeze on
 
-	#e_success "Never go into computer sleep mode"
+	#success "Never go into computer sleep mode"
 	#systemsetup -setcomputersleep Off > /dev/null
 
-	e_success "Check for software updates daily, not just once per week"
+	success "Check for software updates daily, not just once per week"
 	defaults write com.apple.SoftwareUpdate ScheduleFrequency -int 1
 
-	#e_success "Disable Notification Center and remove the menu bar icon"
+	#success "Disable Notification Center and remove the menu bar icon"
 	#launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist 2> /dev/null
 
-	e_success "Disabled smart quotes as they are annoying when typing code"
+	success "Disabled smart quotes as they are annoying when typing code"
 	defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false
 
-	e_success "Disabled smart dashes as they are annoying when typing code"
+	success "Disabled smart dashes as they are annoying when typing code"
 	defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false
 
-	e_success "Removing duplicates in the 'Open With' menu"
+	success "Removing duplicates in the 'Open With' menu"
 	/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user
 
-	#e_success "Disable hibernation? (speeds up entering sleep mode)"
+	#success "Disable hibernation? (speeds up entering sleep mode)"
 	#sudo pmset -a hibernatemode 0
 
 fi
@@ -132,50 +132,50 @@ fi
 seek_confirmation "Run Trackpad, Mouse, Keyboard Tweaks?"
 if is_confirmed; then
 
-	#e_success "Trackpad: enable tap to click for this user and for the login screen"
+	#success "Trackpad: enable tap to click for this user and for the login screen"
 	#defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true
 	#defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
 	#defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
 
-	# e_success "Trackpad: map bottom right corner to right-click"
+	# success "Trackpad: map bottom right corner to right-click"
 	# defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadCornerSecondaryClick -int 2
 	# defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadRightClick -bool true
 	# defaults -currentHost write NSGlobalDomain com.apple.trackpad.trackpadCornerClickBehavior -int 1
 	# defaults -currentHost write NSGlobalDomain com.apple.trackpad.enableSecondaryClick -bool true
 
-	# e_success "Disable “natural” (Lion-style) scrolling"
+	# success "Disable “natural” (Lion-style) scrolling"
 	# defaults write NSGlobalDomain com.apple.swipescrolldirection -bool false
 
-	e_success "Setting trackpad & mouse speed to a reasonable number"
+	success "Setting trackpad & mouse speed to a reasonable number"
 	defaults write -g com.apple.trackpad.scaling 2
 	defaults write -g com.apple.mouse.scaling 2.5
 
-	e_success "Increase sound quality for Bluetooth headphones/headsets"
+	success "Increase sound quality for Bluetooth headphones/headsets"
 	defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int 40
 
-	e_success "Enable full keyboard access for all controls"
+	success "Enable full keyboard access for all controls"
 	# (e.g. enable Tab in modal dialogs)
 	defaults write NSGlobalDomain AppleKeyboardUIMode -int 3
 
-	e_success "Use scroll gesture with the Ctrl (^) modifier key to zoom"
+	success "Use scroll gesture with the Ctrl (^) modifier key to zoom"
 	defaults write com.apple.universalaccess closeViewScrollWheelToggle -bool true
 	defaults write com.apple.universalaccess HIDScrollZoomModifierMask -int 262144
 	# Follow the keyboard focus while zoomed in
 	defaults write com.apple.universalaccess closeViewZoomFollowsFocus -bool true
 
-	e_success "Disable press-and-hold for keys in favor of key repeat"
+	success "Disable press-and-hold for keys in favor of key repeat"
 	defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
 
-	e_success "Set a blazingly fast keyboard repeat rate"
+	success "Set a blazingly fast keyboard repeat rate"
 	defaults write NSGlobalDomain KeyRepeat -int 0
 
-	e_success "Automatically illuminate built-in MacBook keyboard in low light"
+	success "Automatically illuminate built-in MacBook keyboard in low light"
 	defaults write com.apple.BezelServices kDim -bool true
 
-	e_success "Turn off keyboard illumination when computer is not used for 5 minutes"
+	success "Turn off keyboard illumination when computer is not used for 5 minutes"
 	defaults write com.apple.BezelServices kDimTime -int 300
 
-	e_success "Set language and text formats"
+	success "Set language and text formats"
 	# Note: if you’re in the US, replace `EUR` with `USD`, `Centimeters` with
 	# `Inches`, `en_GB` with `en_US`, and `true` with `false`.
 	defaults write NSGlobalDomain AppleLanguages -array "en" "nl"
@@ -183,11 +183,11 @@ if is_confirmed; then
 	defaults write NSGlobalDomain AppleMeasurementUnits -string "Inches"
 	defaults write NSGlobalDomain AppleMetricUnits -bool false
 
-	e_success "Set the timezone"
+	success "Set the timezone"
 	systemsetup -settimezone "America/New_York" > /dev/null
 	#see `systemsetup -listtimezones` for other values
 
-	#e_success "Disable spelling auto-correct"
+	#success "Disable spelling auto-correct"
 	#defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 
 	# Stop iTunes from responding to the keyboard media keys
@@ -200,24 +200,24 @@ fi
 
 seek_confirmation "Run Screen Configurations?"
 if is_confirmed; then
-	e_success "Require password immediately after sleep or screen saver begins"
+	success "Require password immediately after sleep or screen saver begins"
 	defaults write com.apple.screensaver askForPassword -int 1
 	defaults write com.apple.screensaver askForPasswordDelay -int 0
 
-	e_success "Save screenshots to the desktop"
+	success "Save screenshots to the desktop"
 	defaults write com.apple.screencapture location -string "${HOME}/Desktop"
 
-	e_success "Save screenshots in PNG format"
+	success "Save screenshots in PNG format"
 	defaults write com.apple.screencapture type -string "png"
 	# other options: BMP, GIF, JPG, PDF, TIFF, PNG
 
-	#e_success "Disable shadow in screenshots"
+	#success "Disable shadow in screenshots"
 	#defaults write com.apple.screencapture disable-shadow -bool true
 
-	e_success "Enable subpixel font rendering on non-Apple LCDs"
+	success "Enable subpixel font rendering on non-Apple LCDs"
 	defaults write NSGlobalDomain AppleFontSmoothing -int 2
 
-	#e_success "Enabling HiDPI display modes (requires restart)"
+	#success "Enabling HiDPI display modes (requires restart)"
 	#sudo defaults write /Library/Preferences/com.apple.windowserver DisplayResolutionEnabled -bool true
 
 fi
@@ -228,107 +228,107 @@ fi
 
 seek_confirmation "Run Finder Tweaks?"
 if is_confirmed; then
-	e_success "Finder: allow quitting via ⌘ + Q"
+	success "Finder: allow quitting via ⌘ + Q"
 	defaults write com.apple.finder QuitMenuItem -bool true
 
-	e_success "Finder: disable window animations and Get Info animations"
+	success "Finder: disable window animations and Get Info animations"
 	defaults write com.apple.finder DisableAllAnimations -bool true
 
-	e_success "Set Home Folder as the default location for new Finder windows"
+	success "Set Home Folder as the default location for new Finder windows"
 	# For other paths, use `PfLo` and `file:///full/path/here/`
 	defaults write com.apple.finder NewWindowTarget -string "PfDe"
 	defaults write com.apple.finder NewWindowTargetPath -string "file://${HOME}/"
 
-	e_success "Show icons for hard drives, servers, and removable media on the desktop"
+	success "Show icons for hard drives, servers, and removable media on the desktop"
 	defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool true
 	defaults write com.apple.finder ShowHardDrivesOnDesktop -bool true
 	defaults write com.apple.finder ShowMountedServersOnDesktop -bool true
 	defaults write com.apple.finder ShowRemovableMediaOnDesktop -bool true
 
-	#e_success "Finder: show hidden files by default"
+	#success "Finder: show hidden files by default"
 	#defaults write com.apple.finder AppleShowAllFiles -bool true
 
-	e_success "Finder: show all filename extensions"
+	success "Finder: show all filename extensions"
 	defaults write NSGlobalDomain AppleShowAllExtensions -bool true
 
-	e_success "Finder: show status bar"
+	success "Finder: show status bar"
 	defaults write com.apple.finder ShowStatusBar -bool true
 
-	e_success "Finder: show path bar"
+	success "Finder: show path bar"
 	defaults write com.apple.finder ShowPathbar -bool true
 
-	e_success "Finder: allow text selection in Quick Look"
+	success "Finder: allow text selection in Quick Look"
 	defaults write com.apple.finder QLEnableTextSelection -bool true
 
-	#e_success "Display full POSIX path as Finder window title"
+	#success "Display full POSIX path as Finder window title"
 	#defaults write com.apple.finder _FXShowPosixPathInTitle -bool true
 
-	e_success "When performing a search, search the current folder by default"
+	success "When performing a search, search the current folder by default"
 	defaults write com.apple.finder FXDefaultSearchScope -string "SCcf"
 
-	e_success "Disable the warning when changing a file extension"
+	success "Disable the warning when changing a file extension"
 	defaults write com.apple.finder FXEnableExtensionChangeWarning -bool false
 
-	e_success "Enable spring loading for directories"
+	success "Enable spring loading for directories"
 	defaults write NSGlobalDomain com.apple.springing.enabled -bool true
 
-	e_success "Remove the spring loading delay for directories"
+	success "Remove the spring loading delay for directories"
 	defaults write NSGlobalDomain com.apple.springing.delay -float 0
 
-	e_success "Avoid creating .DS_Store files on network volumes"
+	success "Avoid creating .DS_Store files on network volumes"
 	defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
 
-	e_success "Disable disk image verification"
+	success "Disable disk image verification"
 	defaults write com.apple.frameworks.diskimages skip-verify -bool true
 	defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
 	defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
 
-	# e_success "Automatically open a new Finder window when a volume is mounted"
+	# success "Automatically open a new Finder window when a volume is mounted"
 	# defaults write com.apple.frameworks.diskimages auto-open-ro-root -bool true
 	# defaults write com.apple.frameworks.diskimages auto-open-rw-root -bool true
 	# defaults write com.apple.finder OpenWindowForNewRemovableDisk -bool true
 
-	e_success "Show item info near icons on the desktop and in other icon views"
+	success "Show item info near icons on the desktop and in other icon views"
 	/usr/libexec/PlistBuddy -c "Set :DesktopViewSettings:IconViewSettings:showItemInfo true" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set :FK_StandardViewSettings:IconViewSettings:showItemInfo true" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set :StandardViewSettings:IconViewSettings:showItemInfo true" ~/Library/Preferences/com.apple.finder.plist
 
-	e_success "Show item info to the right of the icons on the desktop"
+	success "Show item info to the right of the icons on the desktop"
 	/usr/libexec/PlistBuddy -c "Set DesktopViewSettings:IconViewSettings:labelOnBottom false" ~/Library/Preferences/com.apple.finder.plist
 
-	e_success "Enable snap-to-grid for icons on the desktop and in other icon views"
+	success "Enable snap-to-grid for icons on the desktop and in other icon views"
 	/usr/libexec/PlistBuddy -c "Set DesktopViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set FK_StandardViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set StandardViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist
 
-	e_success "Increase grid spacing for icons on the desktop and in other icon views"
+	success "Increase grid spacing for icons on the desktop and in other icon views"
 	/usr/libexec/PlistBuddy -c "Set DesktopViewSettings:IconViewSettings:gridSpacing 100" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set FK_StandardViewSettings:IconViewSettings:gridSpacing 100" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set StandardViewSettings:IconViewSettings:gridSpacing 100" ~/Library/Preferences/com.apple.finder.plist
 
-	e_success "Increase the size of icons on the desktop and in other icon views"
+	success "Increase the size of icons on the desktop and in other icon views"
 	/usr/libexec/PlistBuddy -c "Set DesktopViewSettings:IconViewSettings:iconSize 40" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set FK_StandardViewSettings:IconViewSettings:iconSize 40" ~/Library/Preferences/com.apple.finder.plist
 	/usr/libexec/PlistBuddy -c "Set StandardViewSettings:IconViewSettings:iconSize 40" ~/Library/Preferences/com.apple.finder.plist
 
-	e_success "Use column view in all Finder windows by default"
+	success "Use column view in all Finder windows by default"
 	defaults write com.apple.finder FXPreferredViewStyle -string "clmv"
 	# Four-letter codes for the other view modes: `icnv`, `clmv`, `Flwv`, `Nlsv`
 
-	e_success "Disable the warning before emptying the Trash"
+	success "Disable the warning before emptying the Trash"
 	defaults write com.apple.finder WarnOnEmptyTrash -bool false
 
-	# e_success "Empty Trash securely by default"
+	# success "Empty Trash securely by default"
 	# defaults write com.apple.finder EmptyTrashSecurely -bool true
 
-	e_success "Show the ~/Library folder"
+	success "Show the ~/Library folder"
 	chflags nohidden ~/Library
 
-	#e_success "Remove Dropbox’s green checkmark icons in Finder"
+	#success "Remove Dropbox’s green checkmark icons in Finder"
 	#file=/Applications/Dropbox.app/Contents/Resources/emblem-dropbox-uptodate.icns
 	#[ -e "${file}" ] && mv -f "${file}" "${file}.bak"
 
-	e_success "Expand File Info panes"
+	success "Expand File Info panes"
 	# “General”, “Open with”, and “Sharing & Permissions”
 	defaults write com.apple.finder FXInfoPanesExpanded -dict \
 		General -bool true \
@@ -346,55 +346,55 @@ defaults write com.apple.NetworkBrowser BrowseAllInterfaces -bool true
 seek_confirmation "Configure Dock, Dashboard, Corners?"
 if is_confirmed; then
 
-	e_success "Enable highlight hover effect for the grid view of a stack"
+	success "Enable highlight hover effect for the grid view of a stack"
 	defaults write com.apple.dock mouse-over-hilite-stack -bool true
 
-	e_success "Set the icon size of Dock items to 36 pixels"
+	success "Set the icon size of Dock items to 36 pixels"
 	defaults write com.apple.dock tilesize -int 36
 
-	e_success "Minimize windows into their application’s icon"
+	success "Minimize windows into their application’s icon"
 	defaults write com.apple.dock minimize-to-application -bool true
 
-	e_success "Enable spring loading for all Dock items"
+	success "Enable spring loading for all Dock items"
 	defaults write com.apple.dock enable-spring-load-actions-on-all-items -bool true
 
-	e_success "Show indicator lights for open applications in the Dock"
+	success "Show indicator lights for open applications in the Dock"
 	defaults write com.apple.dock show-process-indicators -bool true
 
-	e_success "Wipe all (default) app icons from the Dock"
+	success "Wipe all (default) app icons from the Dock"
 	# This is only really useful when setting up a new Mac, or if you don’t use
 	# the Dock to launch apps.
 	defaults write com.apple.dock persistent-apps -array
 
-	e_success "Don’t animate opening applications from the Dock"
+	success "Don’t animate opening applications from the Dock"
 	defaults write com.apple.dock launchanim -bool false
 
-	e_success "Speed up Mission Control animations"
+	success "Speed up Mission Control animations"
 	defaults write com.apple.dock expose-animation-duration -float 0.1
 
-	# e_success "Don’t group windows by application in Mission Control"
+	# success "Don’t group windows by application in Mission Control"
 	# # (i.e. use the old Exposé behavior instead)
 	# defaults write com.apple.dock expose-group-by-app -bool false
 
-	e_success "Disable Dashboard"
+	success "Disable Dashboard"
 	defaults write com.apple.dashboard mcx-disabled -bool true
 
-	e_success "Don’t show Dashboard as a Space"
+	success "Don’t show Dashboard as a Space"
 	defaults write com.apple.dock dashboard-in-overlay -bool true
 
-	# e_success "Don’t automatically rearrange Spaces based on most recent use"
+	# success "Don’t automatically rearrange Spaces based on most recent use"
 	# defaults write com.apple.dock mru-spaces -bool false
 
-	e_success "Remove the auto-hiding Dock delay"
+	success "Remove the auto-hiding Dock delay"
 	defaults write com.apple.dock autohide-delay -float 0
 
-	#e_success "Remove the animation when hiding/showing the Dock"
+	#success "Remove the animation when hiding/showing the Dock"
 	#defaults write com.apple.dock autohide-time-modifier -float 0
 
-	e_success "Automatically hide and show the Dock"
+	success "Automatically hide and show the Dock"
 	defaults write com.apple.dock autohide -bool true
 
-	e_success "Make Dock icons of hidden applications translucent"
+	success "Make Dock icons of hidden applications translucent"
 	defaults write com.apple.dock showhidden -bool true
 
 
@@ -403,7 +403,7 @@ if is_confirmed; then
 	# Add a spacer to the right side of the Dock (where the Trash is)
 	#defaults write com.apple.dock persistent-others -array-add '{tile-data={}; tile-type="spacer-tile";}'
 
-	e_success "Disabled hot corners"
+	success "Disabled hot corners"
 	# Possible values:
 	#  0: no-op
 	#  2: Mission Control
@@ -433,20 +433,20 @@ fi
 seek_confirmation "Safari & Webkit tweaks?"
 if is_confirmed; then
 
-	e_success "Privacy: don’t send search queries to Apple"
+	success "Privacy: don’t send search queries to Apple"
 	defaults write com.apple.Safari UniversalSearchEnabled -bool false
 	defaults write com.apple.Safari SuppressSearchSuggestions -bool true
 
-	e_success "Show the full URL in the address bar (note: this still hides the scheme)"
+	success "Show the full URL in the address bar (note: this still hides the scheme)"
 	defaults write com.apple.Safari ShowFullURLInSmartSearchField -bool true
 
-	e_success "Set Safari’s home page to about:blank for faster loading"
+	success "Set Safari’s home page to about:blank for faster loading"
 	defaults write com.apple.Safari HomePage -string "about:blank"
 
-	e_success "Prevent Safari from opening safe files automatically after downloading"
+	success "Prevent Safari from opening safe files automatically after downloading"
 	defaults write com.apple.Safari AutoOpenSafeDownloads -bool false
 
-	# e_success "Allow hitting the Backspace key to go to the previous page in history"
+	# success "Allow hitting the Backspace key to go to the previous page in history"
 	# defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2BackspaceKeyNavigationEnabled -bool true
 
 	# # Hide Safari’s bookmarks bar by default
@@ -458,21 +458,21 @@ if is_confirmed; then
 	# # Disable Safari’s thumbnail cache for History and Top Sites
 	# defaults write com.apple.Safari DebugSnapshotsUpdatePolicy -int 2
 
-	e_success "Enable Safari’s debug menu"
+	success "Enable Safari’s debug menu"
 	defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
 
-	e_success "Make Safari’s search banners default to Contains instead of Starts With"
+	success "Make Safari’s search banners default to Contains instead of Starts With"
 	defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false
 
-	e_success "Remove useless icons from Safari’s bookmarks bar"
+	success "Remove useless icons from Safari’s bookmarks bar"
 	defaults write com.apple.Safari ProxiesInBookmarksBar "()"
 
-	e_success "Enable the Develop menu and the Web Inspector in Safari"
+	success "Enable the Develop menu and the Web Inspector in Safari"
 	defaults write com.apple.Safari IncludeDevelopMenu -bool true
 	defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
 	defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled -bool true
 
-	e_success "Add a context menu item for showing the Web Inspector in web views"
+	success "Add a context menu item for showing the Web Inspector in web views"
 	defaults write NSGlobalDomain WebKitDeveloperExtras -bool true
 fi
 
@@ -483,23 +483,23 @@ fi
 seek_confirmation "Configure Mail.app?"
 if is_confirmed; then
 
-	e_success "Disable send and reply animations in Mail.app"
+	success "Disable send and reply animations in Mail.app"
 	defaults write com.apple.mail DisableReplyAnimations -bool true
 	defaults write com.apple.mail DisableSendAnimations -bool true
 
-	e_success "Copy sane email addresses to clipboard"
+	success "Copy sane email addresses to clipboard"
 	# Copy email addresses as `foo@example.com` instead of `Foo Bar <foo@example.com>` in Mail.app
 	defaults write com.apple.mail AddressesIncludeNameOnPasteboard -bool false
 
-	#e_success "Add the keyboard shortcut ⌘ + Enter to send an email in Mail.app"
+	#success "Add the keyboard shortcut ⌘ + Enter to send an email in Mail.app"
 	#defaults write com.apple.mail NSUserKeyEquivalents -dict-add "Send" -string "@\\U21a9"
 
-	e_success "Display emails in threaded mode, sorted by date (newest at the top)"
+	success "Display emails in threaded mode, sorted by date (newest at the top)"
 	defaults write com.apple.mail DraftsViewerAttributes -dict-add "DisplayInThreadedMode" -string "yes"
 	defaults write com.apple.mail DraftsViewerAttributes -dict-add "SortedDescending" -string "no"
 	defaults write com.apple.mail DraftsViewerAttributes -dict-add "SortOrder" -string "received-date"
 
-	#e_success "Disable inline attachments (just show the icons)"
+	#success "Disable inline attachments (just show the icons)"
 	#defaults write com.apple.mail DisableInlineAttachmentViewing -bool false
 
 fi
@@ -514,11 +514,11 @@ if is_confirmed; then
 	# Hide Spotlight tray-icon (and subsequent helper)
 	#sudo chmod 600 /System/Library/CoreServices/Search.bundle/Contents/MacOS/Search
 
-	e_success "Disabled Spotlight indexing for any new mounted volume"
+	success "Disabled Spotlight indexing for any new mounted volume"
 	# Use `sudo mdutil -i off "/Volumes/foo"` to stop indexing any volume.
 	sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
 
-	e_success "Change indexing order and disable some file types"
+	success "Change indexing order and disable some file types"
     # Yosemite-specific search results (remove them if your are using OS X 10.9 or older):
     #   MENU_DEFINITION
     #   MENU_CONVERSION
@@ -564,7 +564,7 @@ fi
 seek_confirmation "Configure Terminal.app?"
 if is_confirmed; then
 
-	e_success "Only use UTF-8 in Terminal.app"
+	success "Only use UTF-8 in Terminal.app"
 	defaults write com.apple.terminal StringEncodings -array 4
 
 	# Use a modified version of the Pro theme by default in Terminal.app
@@ -581,10 +581,10 @@ fi
 
 seek_confirmation "Configure iTerm2?"
 if is_confirmed; then
-	e_success "Installed pretty iTerm colors"
+	success "Installed pretty iTerm colors"
 	open "${HOME}/Dropbox/sharedConfiguration/App Configuration Files/iTerm/nate.itermcolors"
 
-	e_success "Don't display the annoying prompt when quitting iTerm"
+	success "Don't display the annoying prompt when quitting iTerm"
 	defaults write com.googlecode.iterm2 PromptOnQuit -bool false
 fi
 
@@ -594,10 +594,10 @@ fi
 
 seek_confirmation "Disable Time Machine?"
 if is_confirmed; then
-	e_success "Prevent Time Machine from prompting to use new hard drives as backup volume"
+	success "Prevent Time Machine from prompting to use new hard drives as backup volume"
 	defaults write com.apple.TimeMachine DoNotOfferNewDisksForBackup -bool true
 
-	e_success "Disable local Time Machine backups"
+	success "Disable local Time Machine backups"
 	hash tmutil &> /dev/null && sudo tmutil disablelocal
 fi
 
@@ -607,16 +607,16 @@ fi
 
 seek_confirmation "Configure Activity Monitor?"
 if is_confirmed; then
-	e_success "Show the main window when launching Activity Monitor"
+	success "Show the main window when launching Activity Monitor"
 	defaults write com.apple.ActivityMonitor OpenMainWindow -bool true
 
-	e_success "Visualize CPU usage in the Activity Monitor Dock icon"
+	success "Visualize CPU usage in the Activity Monitor Dock icon"
 	defaults write com.apple.ActivityMonitor IconType -int 5
 
-	e_success "Show all processes in Activity Monitor"
+	success "Show all processes in Activity Monitor"
 	defaults write com.apple.ActivityMonitor ShowCategory -int 0
 
-	e_success "Sort Activity Monitor results by CPU usage"
+	success "Sort Activity Monitor results by CPU usage"
 	defaults write com.apple.ActivityMonitor SortColumn -string "CPUUsage"
 	defaults write com.apple.ActivityMonitor SortDirection -int 0
 fi
@@ -634,7 +634,7 @@ fi
 
 seek_confirmation "Configure Contacts, Calendar, TextEdit, Disk Util?"
 if is_confirmed; then
-	e_success "Enable the debug menu in Address Book"
+	success "Enable the debug menu in Address Book"
 	defaults write com.apple.addressbook ABShowDebugMenu -bool true
 
 	# Enable Dashboard dev mode (allows keeping widgets on the desktop)
@@ -643,13 +643,13 @@ if is_confirmed; then
 	# Enable the debug menu in iCal (pre-10.8)
 	# defaults write com.apple.iCal IncludeDebugMenu -bool true
 
-	e_success "Use plain text mode for new TextEdit documents"
+	success "Use plain text mode for new TextEdit documents"
 	defaults write com.apple.TextEdit RichText -int 0
-	e_success "Open and save files as UTF-8 in TextEdit"
+	success "Open and save files as UTF-8 in TextEdit"
 	defaults write com.apple.TextEdit PlainTextEncoding -int 4
 	defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4
 
-	e_success "Enable the debug menu in Disk Utility"
+	success "Enable the debug menu in Disk Utility"
 	defaults write com.apple.DiskUtility DUDebugMenuEnabled -bool true
 	defaults write com.apple.DiskUtility advanced-image-options -bool true
 fi
@@ -657,13 +657,13 @@ fi
 seek_confirmation "Configure Sublime Text 3 in Terminal?"
 if is_confirmed; then
   if [ ! -e "/Applications/Sublime Text.app" ]; then
-    e_error "We don't have Sublime Text.app.  Get it installed and try again."
+    error "We don't have Sublime Text.app.  Get it installed and try again."
   else
     if [ ! -e "/usr/local/bin/subl" ]; then
       ln -s "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" /usr/local/bin/subl
-      e_success "Symlink created"
+      success "Symlink created."
     else
-      e_arrow "Symlink already exists. Nothing done."
+      notice "Symlink already exists. Nothing done."
     fi
   fi
 fi
@@ -673,13 +673,13 @@ fi
 ###############################################################################
 seek_confirmation "Configure Messages.app?"
 if is_confirmed; then
-	e_success "Disable automatic emoji substitution in Messages.app? (i.e. use plain text smileys) (y/n)"
+	success "Disable automatic emoji substitution in Messages.app? (i.e. use plain text smileys) (y/n)"
 	defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticEmojiSubstitutionEnablediMessage" -bool false
 
-	e_success "Disable smart quotes in Messages.app? (it's annoying for messages that contain code) (y/n)"
+	success "Disable smart quotes in Messages.app? (it's annoying for messages that contain code) (y/n)"
   defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticQuoteSubstitutionEnabled" -bool false
 
-	e_success "Disabled continuous spell checking in Messages.app? (y/n)"
+	success "Disabled continuous spell checking in Messages.app? (y/n)"
 	defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false
 fi
 
@@ -687,19 +687,19 @@ fi
 ###############################################################################
 # 14. SSD-specific tweaks                                                         #
 ###############################################################################
-e_header "Running SSD Specific OSX Tweaks"
+header "Running SSD Specific OSX Tweaks"
 
 seek_confirmation "Confirm that you have an SSD Hard Drive and want to disable sudden motion sensor."
 if is_confirmed; then
 
-	# e_success "Remove the sleep image file to save disk space"
+	# success "Remove the sleep image file to save disk space"
 	# sudo rm /Private/var/vm/sleepimage
-	# e_success "Create a zero-byte file instead…"
+	# success "Create a zero-byte file instead…"
 	# sudo touch /Private/var/vm/sleepimage
-	# e_success "…and make sure it can’t be rewritten"
+	# success "…and make sure it can’t be rewritten"
 	# sudo chflags uchg /Private/var/vm/sleepimage
 
-	e_success "Disable the sudden motion sensor as it’s not useful for SSDs"
+	success "Disable the sudden motion sensor as it’s not useful for SSDs"
 	sudo pmset -a sms 0
 fi
 
@@ -712,7 +712,7 @@ if is_confirmed; then
 		"Terminal" "iCal"; do
 		killall "${app}" > /dev/null 2>&1
 	done
-	e_success "Apps killed"
+	success "Apps killed"
 fi
 
-e_note "Some of these changes require a logout/restart to take effect."
+info "Some of these changes require a logout/restart to take effect."

setupScripts/ruby.sh

@@ -15,9 +15,9 @@ RUBYVERSION="2.1.2"
 
 # Check for RVM
 if type_not_exists "rvm"; then
-  seek_confirmation_head "Install RVM?"
+  seek_confirmation "Install RVM?"
   if is_confirmed; then
-    e_warning "Installing RVM (Ruby Version Manager) and Ruby  which becomes the default ..."
+    warning "Installing RVM (Ruby Version Manager) and Ruby  which becomes the default ..."
     curl -L https://get.rvm.io | bash -s stable
     source "~/.rvm/scripts/rvm"
   fi

setupScripts/ssh.sh

@@ -9,19 +9,19 @@ else
   exit
 fi
 
-e_header "Running : SSH CONFIG"
+header "Running : SSH CONFIG"
 
-e_success  "Checking for SSH key in ~/.ssh/id_rsa.pub, generating one if it doesn't exist ..."
+success  "Checking for SSH key in ~/.ssh/id_rsa.pub, generating one if it doesn't exist ..."
 [[ -f ~/.ssh/id_rsa.pub ]] || ssh-keygen -t rsa
 
-e_success "Copying public key to clipboard."
+success "Copying public key to clipboard."
 [[ -f ~/.ssh/id_rsa.pub ]] && cat ~/.ssh/id_rsa.pub | pbcopy
 
 # Add SSH keys to Github
-e_header  "Github integration"
+header  "Github integration"
 seek_confirmation "Open https://github.com/account/ssh in your browser?"
 if is_confirmed; then
-	e_success "Copying public key to clipboard."
+	success "Copying public key to clipboard."
 
 	[[ -f ~/.ssh/id_rsa.pub ]] && cat ~/.ssh/id_rsa.pub | pbcopy
 
@@ -29,9 +29,9 @@ if is_confirmed; then
 
 	seek_confirmation "Test Github Authentication via ssh?"
 		if is_confirmed; then
-			printf "\n Testing..."
+			notice "Testing..."
 			ssh -T git@github.com
 		fi
 fi
 
-e_header "Completed : SSH CONFIG"
+header "Completed : SSH CONFIG"

syncScripts/SyncTemplate.sh

@@ -3,6 +3,8 @@
 # ##################################################
 # My Generic sync script.
 #
+# VERSION 1.1.0
+#
 # This script will give you the option of using rsync
 # or Unison.  Rsync is for one-way syncing, Unison is for
 # two-way syncing.
@@ -24,12 +26,11 @@
 # destroys your data, crashes your car, or otherwise causes mayhem
 # and destruction.  USE AT YOUR OWN RISK.
 #
-VERSION="1.1"
 #
-# HISTORY
+# HISTORY:
-# * 2015-01-03 - v.1.1  - Added version number
+# * 2015-01-03 - v1.1.0  - Added version number
 #                       - Added support for using roots in Unison .prf
-# * 2015-01-02 - v.1.0  - First Creation
+# * 2015-01-02 - v1.0.0  - First Creation
 #
 # ##################################################
 
@@ -49,7 +50,7 @@ CONFIG="../etc/${SCRIPTNAME}.cfg"
 # HELP
 # When -h is passed to the script, this will display inline help
 function HELP () {
-  e_bold "\nHelp for ${SCRIPTNAME}"
+  echo -e "\nHelp for ${SCRIPTNAME}"
   echo -e "This script will give you the option of using rsync"
   echo -e "or Unison.  Rsync is for one-way syncing, Unison is for"
   echo -e "two-way syncing.\n"
@@ -97,10 +98,10 @@ done
 function newCopy() {
   scriptPath
   if [ "${SCRIPTNAME}" = "SyncTemplate.sh" ]; then
-    e_bold "name your new script:"
+    input "name your new script:"
     read newname
     cp "${SCRIPTPATH}"/"${SCRIPTNAME}" "${SCRIPTPATH}"/"${newname}"
-    e_success "${newname} created."
+    success "${newname} created."
     exit 0
   fi
 }
@@ -206,8 +207,8 @@ PUSHOVERNOTIFY="false"
 # Leave blank if not needed.
 CANONICALHOST=""
 EOL
-  e_success "Config file created. Edit the values before running this script again."
+  success "Config file created. Edit the values before running this script again."
-  e_arrow "The file is located at: ${CONFIG}"
+  notice "The file is located at: ${CONFIG}"
   echo "Exiting."
   exit 0
   fi
@@ -248,7 +249,7 @@ function mainScript() {
   if [ "${NEEDMOUNT}" = "true" ] || [ "${NEEDMOUNT}" = "TRUE" ]; then
     # Mount AFP volume
     if is_not_dir "${REMOTEVOLUME}"; then
-      e_arrow "Mounting drive"
+      notice "Mounting drive"
       mkdir "${REMOTEVOLUME}"
       if [ "${MOUTPW}" = "true" ]; then # if password prompt needed
         mount_afp -i "${MOUNTPOINT}" "${REMOTEVOLUME}"
@@ -257,9 +258,9 @@ function mainScript() {
       fi
       sleep 10
       echo "${NOW} - ${REMOTEVOLUME} Mounted" >> "${LOGFILE}"
-      e_success "${REMOTEVOLUME} Mounted"
+      success "${REMOTEVOLUME} Mounted"
     else
-      e_success "${REMOTEVOLUME} already mounted"
+      success "${REMOTEVOLUME} already mounted"
     fi
   fi
 
@@ -268,7 +269,7 @@ function mainScript() {
 
   # test for target
   if is_dir "${TARGETDIRECTORY}"; then
-    e_success "${TARGETDIRECTORY} exists"
+    success "${TARGETDIRECTORY} exists"
   else
     if [ "${NEEDMOUNT}" = "true" ] || [ "${NEEDMOUNT}" = "TRUE" ]; then
       unmountDrive "${REMOTEVOLUME}"
@@ -282,7 +283,7 @@ function mainScript() {
 
   # Test for source directory
   if is_dir "${SOURCEDIRECTORY}"; then
-    e_success "${SOURCEDIRECTORY} exists"
+    success "${SOURCEDIRECTORY} exists"
   else
     if [ "${NEEDMOUNT}" = "true" ] || [ "${NEEDMOUNT}" = "TRUE" ]; then
       unmountDrive "${REMOTEVOLUME}"
@@ -350,7 +351,7 @@ function mainScript() {
   if [ "${NEEDMOUNT}" = "true" ] || [ "${NEEDMOUNT}" = "TRUE" ]; then
     unmountDrive "${REMOTEVOLUME}"
     echo "${NOW} - ${REMOTEVOLUME} Unmounted" >> "${LOGFILE}"
-    e_success "${REMOTEVOLUME} UnMounted"
+    success "${REMOTEVOLUME} UnMounted"
   fi
 
   # Time the script by logging the end time
@@ -366,7 +367,7 @@ function mainScript() {
   echo "${NOW} - ${SCRIPTNAME} completed in $(convertsecs $TOTALTIME)" >> "${LOGFILE}"
   echo -e "-----------------------------------------------------\n" >> "${LOGFILE}"
 
-  e_success "${NOW} - ${SCRIPTNAME} completed in $(convertsecs $TOTALTIME)"
+  success "${NOW} - ${SCRIPTNAME} completed in $(convertsecs $TOTALTIME)"
 }
 
 newCopy