Fixes

Author: Oscar Tanner

.dots

@@ -32,14 +32,14 @@ function runDots() {
             echo ""
             ./brew.sh
         fi
-        if [ $ARG == "android" ] || [ $ARG == "all" ]; then
-            # Run the android.sh Script
-            echo "------------------------------"
-            echo "Setting up Android development environment."
-            echo "------------------------------"
-            echo ""
-            ./android.sh
-        fi
+        # if [ $ARG == "android" ] || [ $ARG == "all" ]; then
+        #     # Run the android.sh Script
+        #     echo "------------------------------"
+        #     echo "Setting up Android development environment."
+        #     echo "------------------------------"
+        #     echo ""
+        #     ./android.sh
+        # fi
 	# if [ $ARG == "QA" ] || [ $ARG == "all" ]; then
         #     # Run the qa.sh Script
         #     echo "------------------------------"

README.md

@@ -4,8 +4,8 @@ dev-setup
 
 ## Utilization
 
-1. Download and install Xcode
-2. Open Xcode and accept its terms
+1. Download and install Xcode (If needed)
+2. Open Xcode and accept its terms (If you installed Xcode)
 3. Run script
 ```
 ./.dots all
@@ -20,24 +20,26 @@ gem install bundler
 ```
 
 6. Reboot your machine
-7. Open Android Studio and install Android SDK
-8. Add `JAVA_HOME` to your `.extra` or `.bash_profile`
+7. Run `.android.sh` if you need android stuff
+8. Open Android Studio and install Android SDK (if you runned android script)
+9. Add `JAVA_HOME` to your `.extra` or `.bash_profile`
 ```
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk__VERSION__.jdk/Contents/Home
 export PATH="$JAVA_HOME/bin:$PATH"
 ```
-9. Add `ANDROD_HOME` to your `.extra` or `.bash_profile`
+10. Add `ANDROD_HOME` to your `.extra` or `.bash_profile` (If you installed Android)
 ```
 export ANDROID_HOME=~/Library/Android/sdk
 export PATH=$PATH:$ANDROID_HOME/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/lib:$ANDROID_HOME/tools/lib
 ```
-10. You can add some alias to ease your life
+11. You can add some alias to ease your life (If you use Ruby)
 ```
 alias be="bundle exec "
 alias bi="bundle install"
 ```
-11. Install iOS provisioning profiles
-
+12. Install iOS provisioning profiles
+13. Run `./qa.sh` if you are a QA :)
+14. Run `./personal.sh`
 
 --------------------------
 

brew.sh

@@ -38,7 +38,7 @@ brew install findutils
 brew install gnu-sed --with-default-names
 # Install Bash 4.
 brew install bash
-brew tap homebrew/versions
+# brew tap homebrew/versions
 # We installed the new shell, now we have to activate it
 echo "Adding the newly installed shell to the list of allowed shells"
 # Prompts for password
@@ -89,9 +89,9 @@ echo "$LINE" >> ~/.extra
 
 # Install more recent versions of some OS X tools.
 brew install vim --override-system-vi
-brew install homebrew/dupes/grep
-brew install homebrew/dupes/openssh
-brew install homebrew/dupes/screen
+# brew install homebrew/dupes/grep
+# brew install homebrew/dupes/openssh
+# brew install homebrew/dupes/screen
 # brew install homebrew/php/php55 --with-gmp
 
 # Install font tools.
@@ -167,25 +167,19 @@ brew link libxslt --force
 # Core casks
 # brew cask install --appdir="/Applications" alfred
 brew cask install --appdir="~/Applications" iterm2
-brew cask install --appdir="~/Applications" java8
 # brew cask install --appdir="~/Applications" xquartz
 
 # Development tool casks
-brew cask install --appdir="/Applications" sublime-text3
+# brew cask install --appdir="/Applications" sublime-text
 # brew cask install --appdir="/Applications" atom
 brew cask install --appdir="/Applications" virtualbox
-# brew cask install --appdir="/Applications" spotify
+brew cask install --appdir="/Applications" spotify
 # brew cask install --appdir="/Applications" vagrant
 # brew cask install --appdir="/Applications" macdown
 
 # Misc casks
 brew cask install --appdir="/Applications" google-chrome
 # brew cask install --appdir="/Applications" firefox
-# brew cask install --appdir="/Applications" skype
-brew cask install --appdir="/Applications" slack
-# brew cask install --appdir="/Applications" whatsapp
-# brew cask install --appdir="/Applications" dropbox
-# brew cask install --appdir="/Applications" google-backup-and-sync
 # brew cask install --appdir="/Applications" evernote
 # brew cask install --appdir="/Applications" 1password
 # brew cask install --appdir="/Applications" gimp

personal.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Install command-line tools using Homebrew.
+
+# Ask for the administrator password upfront.
+sudo -v
+
+# Keep-alive: update existing `sudo` time stamp until the script has finished.
+while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
+
+# Check for Homebrew,
+# Install if we don't have it
+if test ! $(which brew); then
+  echo "Installing homebrew..."
+  ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+fi
+
+# Make sure we’re using the latest Homebrew.
+brew update
+
+# Upgrade any already-installed formulae.
+brew upgrade --all
+
+brew cask install --appdir="/Applications" whatsapp
+brew cask install --appdir="/Applications" dropbox
+brew cask install --appdir="/Applications" skype
+brew cask install --appdir="/Applications" google-backup-and-sync
+
+# Install Emacs
+brew cask install emacs
+git clone git@github.com:oscartanner/emacs.git ~/.emacs.d

qa.sh

@@ -20,9 +20,6 @@ brew update
 
 brew install node
 
-# Install Emacs
-brew cask install emacs
-
 # Install Appium iOS Dependencies
 brew install carthage
 brew install libimobiledevice --HEAD

work.sh

@@ -21,14 +21,16 @@ brew update
 # Install Cask
 brew tap caskroom/versions
 
+brew cask install java8
+
 brew cask install --appdir="~/Applications" intellij-idea
 brew cask install --appdir="~/Applications" robo-3t
 # brew cask install --appdir="~/Applications" cleanmymac
 # brew cask install --appdir="~/Applications" charles
 # brew cask install --appdir="~/Applications" paw
 brew cask install --appdir="~/Applications" zeplin
 brew cask install --appdir="~/Applications" docker
-
+brew cask install --appdir="/Applications" slack
 
 brew install maven
 # brew install postgres