Yet another pre job move cleanup

bash_profile → dots/bash_profile

@@ -6,12 +6,7 @@ export GREP_OPTIONS="--color=auto"
 export CLICOLOR=1
 export ANDROID_SDK_ROOT='/usr/local/opt/android-sdk'
 export NODE_PATH='/usr/local/lib/node_modules'
-
-if [[ "$OSTYPE" =~ ^darwin ]]; then
-  export GOPATH="/Users/nickp666/go"
-else
-  export GOPATH="/home/nickp666/go"
-fi
+export GOPATH="$HOME/go"
 
 export PATH="$GOPATH/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/python:/usr/local/share/npm/bin:/usr/local/heroku/bin:$PATH"
 export HISTCONTROL=ignoredups:erasedups
@@ -26,7 +21,6 @@ source /usr/local/bin/virtualenvwrapper.sh
 alias projects="cd ~/Projects"
 alias personal="cd ~/Personal"
 alias oss="cd ~/Projects/OSS"
-alias whois="whois -h whois-servers.net"
 
 # OSX Specific
 if [[ "$OSTYPE" =~ ^darwin ]]; then
@@ -40,7 +34,7 @@ if [[ "$OSTYPE" =~ ^darwin ]]; then
 fi
 
 # Hipster Shizzle
-alias startpg9='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
+alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
 alias startmongo='nohup mongod run --config /usr/local/etc/mongod.conf &'
 alias startredis='redis-server /usr/local/etc/redis.conf'
 alias redistogo='redis-cli -h cod.redistogo.com -p 9884 -a'

brewpackages → package_lists/brewpackages

@@ -1,27 +1,25 @@
 ack
 android-ndk
 android-sdk
-apple-gcc42
 appledoc
 autoconf
 automake
 axel
 bazaar
 boost
-brew-cask
+caskroom/cask/brew-cask
 cloc
 cmake
 curl
-curl-ca-bundle
 dfu-programmer
 dirmngr
 dos2unix
 doxygen
-drush
 e2fsprogs
 erlang
 expat
 freetype
+gcc
 gd
 gdbm
 gettext
@@ -87,12 +85,10 @@ rabbitmq
 readline
 redis
 scons
-serf
 sloccount
 splint
 sqlite
 sshuttle
 wget
 xz
 yuicompressor
-zlib

caskapps → package_lists/caskapps

@@ -2,30 +2,36 @@ adium
 airdisplay
 alfred
 all2mp3
+android-file-transfer
 android-studio
 arduino
 blender
 calibre
 candybar
 charles
+clamxav
 cyberduck
 dosbox
 dropbox
-droplr
 filezilla
 firefox
 flash
+flip4mac
 fritzing
+garagesale
 google-chrome
 google-drive
 google-hangouts
 handbrake
 heroku-toolbelt
 hexfiend
+hipchat
 imageoptim
 iterm2
+java
 join-me
-keepass-x
+keepassx
+macpar-deluxe
 macvim
 mongohub
 mysql-workbench

package_lists/debpackages

@@ -0,0 +1,3 @@
+build-essential
+git
+openbox

package_lists/pythonpackages

@@ -0,0 +1,6 @@
+ansible
+virtualenv
+sphinx
+pylint
+pep8
+virtualenvwrapper

setup.sh

@@ -10,7 +10,7 @@ install_dotfiles() {
     echo "Installing dotfiles..."
     for dotshizzle in ${DOTFILES[@]}
     do
-        cp -fv ./${dotshizzle} ~/.${dotshizzle}
+        cp -fv ./dots/${dotshizzle} ~/.${dotshizzle}
     done
 
     # Clearly every terminal should open with darth vader
@@ -27,16 +27,13 @@ setup_vim() {
 install_most_hated_language() {
     echo "Installing the devils programming language..."
     # As much as I love to hate ruby, I need it for some things.
-    curl -L https://get.rvm.io | bash
-    rvm install 2.0.0
+    curl -sSL https://get.rvm.io | bash -s stable --ruby
 }
 
 install_homebrew() {
     echo "Installing homebrew..."
     # Brew
-    ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
-    # Install cask for app goodness
-    brew tap phinze/homebrew-cask
+    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 }
 
 git_config() {
@@ -251,7 +248,7 @@ osx_general_app_settings() {
 restart_osx_shizzle() {
     echo "Restarting affected OSX apps..."
     for app in "Address Book" "Calendar" "Contacts" "Dashboard" "Dock" "Finder" \
-        "Mail" "Safari" "SizeUp" "SystemUIServer" "Terminal" "Transmission" \
+        "Mail" "Safari" "SizeUp" "SystemUIServer" "Transmission" \
         "Twitter" "iCal" "iTunes"; do
         killall "$app" > /dev/null 2>&1;
     done
@@ -271,7 +268,7 @@ install_packages_from_manifest() {
         else
             $1 install  "$line";
         fi
-    done < $2;
+    done < "./package_lists/$2";
     echo "Done installing ${1} packages...";
 }
 
@@ -286,11 +283,10 @@ install_dotfiles;
 
 setup_vim;
 
-install_most_hated_language;
-
 git_config;
 
 if [[ "$OSTYPE" =~ ^darwin ]]; then
+    DISTRO="OSX";
     echo "I sense something fruity...";
     install_homebrew;
     osx_general_settings;
@@ -303,11 +299,21 @@ if [[ "$OSTYPE" =~ ^darwin ]]; then
     export HOMEBREW_CASK_OPTS="--appdir=/Applications"
     install_packages_from_manifest "cask" "caskapps";
     echo "Finished fruity packages and settings...";
+else
+    DISTRO=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`;
+fi
+
+if [ "$DISTRO" == "Ubuntu" ]; then
+    echo "Installing debs..."
+    install_packages_from_manifest "apt-get" "debpackages";
 fi
 
-echo "Installing ruby, perl and node packages...";
+install_most_hated_language;
+
+echo "Installing ruby, perl, python and node packages...";
 install_packages_from_manifest "gem" "rubygems";
 install_packages_from_manifest "npm" "nodeglobpackages";
 install_packages_from_manifest "cpan" "cpanpackages";
+install_packages_from_manifest "pip" "pythonpackages";
 
 echo "[DONE] Shizzle is set up. Some of this requires a logout/restart to take effect.";