From bdefac59a3cd505a4471319e7d08c0b77031a739 Mon Sep 17 00:00:00 2001 From: Ijmir Date: Mon, 9 Feb 2015 02:52:19 +0200 Subject: [PATCH 1/2] feat(app): Added the Spectacle app Fixes #22 --- README.md | 1 + install.sh | 4 ++++ test.sh | 1 + 3 files changed, 6 insertions(+) diff --git a/README.md b/README.md index b04d89a..97738ea 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ curl -L https://raw.githubusercontent.com/Yoobic/install-mac/master/install.sh | * Mongodb * Skype * Slack +* Spectacle * Sublime Text 3 * VirtualBox diff --git a/install.sh b/install.sh index 264baba..fdb6b4b 100755 --- a/install.sh +++ b/install.sh @@ -65,6 +65,7 @@ inquirer_software() { "Mongo" "Mongodb" on "Skype" "Skype" on "Slack" "Slack" on + "Spectacle" "Spectacle" on "SublimeText3" "Sublime Text 3" on "VirtualBox" "Virtual Box" on "Bower" "Bower" on @@ -147,6 +148,9 @@ brew install imagemagick brew install git brew install python +if ([[ $choice == *"all"* ]] || [[ $choice == "Spectacle" ]]); then + brew cask install spectacle --force +fi if ([[ $choice == *"all"* ]] || [[ $choice == "SublimeText3" ]]); then brew cask install sublime-text3 --force fi diff --git a/test.sh b/test.sh index 38020a8..2af64c8 100755 --- a/test.sh +++ b/test.sh @@ -50,6 +50,7 @@ check_file "$(which subl)" "subl" # check Sublime Text version check_file $HOME/.zshrc check_file "$app_folder/Sublime Text.app" # check Sublime Text software check_file "$app_folder/iTerm.app" # check iTerm2 software +check_file "$app_folder/Spectacle.app" # check iTerm2 software #check_file "$app_folder/alfred.app" # check iTerm2 software check_file "$app_folder/Dropbox.app" # check Dropbox software check_file "$app_folder/Skype.app" # check Skype software From 7eb4a556eec978f9303c0b0d9ee294d5cf868112 Mon Sep 17 00:00:00 2001 From: Ijmir Date: Mon, 9 Feb 2015 11:39:47 +0200 Subject: [PATCH 2/2] feat(app): Added existence check for some of the software --- install.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index fdb6b4b..4569a0c 100755 --- a/install.sh +++ b/install.sh @@ -142,11 +142,21 @@ inquirer_software ############ SOFTWARE ############ echo_title "BEGIN INSTALLING SOFTWARE" -brew install tree -brew install wget -brew install imagemagick -brew install git -brew install python +if ( ! which tree >/dev/null); then + brew install tree; +fi +if ( ! which wget >/dev/null); then + brew install wget; +fi +if ( ! which imagemagick >/dev/null); then + brew install imagemagick; +fi +if ( ! which git >/dev/null); then + brew install git; +fi +if ( ! which python >/dev/null); then + brew install python; +fi if ([[ $choice == *"all"* ]] || [[ $choice == "Spectacle" ]]); then brew cask install spectacle --force