New script template

2025-11-10 14:13:45 -05:00 · 2015-01-07 22:59:39 -05:00
parent 5ff40a206c
commit 238f27e581
15 changed files with 543 additions and 259 deletions
--- a/setupScripts/fileTest.sh
+++ b/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
--- a/setupScripts/mackup.sh
+++ b/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."
-sleep 10
-e_warning "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

 # 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."
-  e_error "Run 'brew install mackup' or run the Homebrew setup script. Exiting."
-  exit 0
+  info "Run 'brew install mackup' or run the Homebrew setup script."
+  die "MACKUP NOT FOUND."
 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
--- a/setupScripts/newMacSetup.sh
+++ b/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"
-			exit 0
+			die "$file does not exist. Exiting"
 		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
--- a/setupScripts/osx.sh
+++ b/setupScripts/osx.sh
@@ -12,12 +12,12 @@ fi
 # Grant sudo privs.
 needSudo

-e_header  "Beginning osx.sh"
-e_note "This script runs a series of commands to pre-configure OSX."
+header  "Beginning osx.sh"
+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."
--- a/setupScripts/ruby.sh
+++ b/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
--- a/setupScripts/ssh.sh
+++ b/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"