From 9e841588b6944b50543a112b303278b6eb386c7f Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Tue, 29 Mar 2016 14:57:34 -0700
Subject: [PATCH] install script updates

* fix logging and spacing issues
* update to use bash instead of zsh
---
 install.sh       |  8 ++------
 install/brew.sh  |  3 ++-
 install/link.sh  | 11 +++++++----
 install/nginx.sh |  5 +++--
 install/nvm.sh   |  3 +++
 install/osx.sh   |  3 +++
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index 6343cd4..c468df9 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "Installing dotfiles"
 
@@ -8,18 +8,14 @@ git submodule update --init --recursive
 source install/link.sh
 
 if [ "$(uname)" == "Darwin" ]; then
-    echo "Running on OSX"
+    echo -e "\n\nRunning on OSX"
 
-    echo "Brewing all the things"
     source install/brew.sh
 
-    echo "Updating OSX settings"
     source install/osx.sh
 
-    echo "Installing node (from nvm)"
     source install/nvm.sh
 
-    echo "Configuring nginx"
     # create a backup of the original nginx.conf
     mv /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/nginx.original
     ln -s ~/.dotfiles/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf
diff --git a/install/brew.sh b/install/brew.sh
index 8c8a6b4..054363c 100755
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -5,7 +5,8 @@ if test ! $(which brew); then
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
 
-echo "Installing homebrew packages..."
+echo -e "\n\nInstalling homebrew packages..."
+echo "=============================="
 
 # cli tools
 brew install ack
diff --git a/install/link.sh b/install/link.sh
index 922e70a..8b9b944 100755
--- a/install/link.sh
+++ b/install/link.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env bash
 
 DOTFILES=$HOME/.dotfiles
 
@@ -39,12 +39,15 @@ done
 # like to configure vim, so lets symlink ~/.vimrc and ~/.vim over to their
 # neovim equivalent.
 
-echo "\nCreating vim symlinks"
+echo -e "\n\nCreating vim symlinks"
 echo "=============================="
 
-typeset -A vimfiles=(~/.vim $DOTFILES/config/nvim ~/.vimrc $DOTFILES/config/nvim/init.vim)
+typeset -A vimfiles
+vimfiles[~/.vim]=$DOTFILES/config/nvim
+vimfiles[~/.vimrc]=$DOTFILES/config/nvim/init.vim
 
-for file in "${(@k)vimfiles}"; do
+for file in "${!vimfiles[@]}"; do
+# for file in "${(@k)vimfiles}"; do
     # echo "$file -> $vimfiles[$file]"
     if [ -e ${file} ]; then
         echo "${file} already exists... skipping"
diff --git a/install/nginx.sh b/install/nginx.sh
index 64f64ca..d65e963 100755
--- a/install/nginx.sh
+++ b/install/nginx.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
+echo -e "\n\nInstalling nginx"
+echo "=============================="
+
 ######################################################
 # nginx setup
 ######################################################
 
 $DOTFILES=$HOME/.dotfiles
 
-echo "Installing nginx"
-
 # first, make sure apache is off
 sudo launchctl unload -w /System/Library/LaunchDaemons/org.apache.httpd.plist
 
diff --git a/install/nvm.sh b/install/nvm.sh
index 81d212e..3d249cd 100755
--- a/install/nvm.sh
+++ b/install/nvm.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+echo -e "\n\nInstalling Node (from nvm)"
+echo "=============================="
+
 # reload nvm into this environment
 source $(brew --prefix nvm)/nvm.sh
 
diff --git a/install/osx.sh b/install/osx.sh
index d1c066d..752fd1c 100755
--- a/install/osx.sh
+++ b/install/osx.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env sh
 
+echo -e "\n\nSetting OS X settings"
+echo "=============================="
+
 # echo "Finder: show all filename extensions"
 defaults write NSGlobalDomain AppleShowAllExtensions -bool true