OS X setup improvements

aliases

@@ -141,9 +141,11 @@ function gitCmdWrapper {
   fi
 }
 
-# Fix a weird mingw 'not a valid identifierline' error.
+if [[ $platform != 'Darwin' && $platform != 'Linux' ]]; then
-# Got the fix from https://github.com/Alexpux/MSYS2-packages/issues/735#issuecomment-328938800
+  # Fix a weird mingw 'not a valid identifierline' error.
-alias git="PATH=/usr/bin git"
+  # Got the fix from https://github.com/Alexpux/MSYS2-packages/issues/735#issuecomment-328938800
+  alias git="PATH=/usr/bin git"
+fi
 
 alias am='git commit --amend'
 alias ama='git commit --amend -C head --author'

install.sh

@@ -34,6 +34,9 @@ setup_dotfile_repo() {
     printf "${YELLOW}Creating dotfiles symlink${NORMAL}\n"
     ln -s $cwd $HOME/.dotfiles
   fi
+
+  # Used by various things (e.g. vim history)
+  mkdir -p $HOME/tmp
 }
 
 link_file() {

osx/install.sh

@@ -35,6 +35,7 @@ printf "Installing xquartz..."
 brew_packages=(
   'tree'
   'openssl'
+  'git'
 #  'xclip'
   'rlwrap'
   'cmake'

zlogin

@@ -3,3 +3,9 @@ if [[ -f ~/.current_path~ ]]; then
   cd `cat ~/.current_path~`
   rm ~/.current_path~
 fi
+
+# Need to edit the path again here so that we can get the homebrew bin folder ahead of
+# everything else. This is necessary because zsh is modifying the path in zshrc, and
+# that causes us to run out of /usr/bin for programs that we want to use from homebrew's
+# bin
+path=($HOME/homebrew/opt/openssl/bin $HOME/homebrew/sbin $HOME/homebrew/bin $path)