Add setup

README.md

@@ -76,6 +76,19 @@ If you're setting up a machine for the XP workshop run the following:
 ./setup.sh java node
 ```
 
+### Additional tools
+
+To see a list of additional tool sets available to install run the following:
+
+```sh
+printf "%s " `ls scripts/opt-in | sed 's/\..*//'`; echo
+```
+
+To add one of these tool sets run:
+```sh
+./add_setup <tool set>
+```
+
 ## Analytics
 
 The tool will send anonymous user data to our Google Analytics account, so we can see what command line arguments are popular.  You can disable this:

_init.sh

@@ -0,0 +1,3 @@
+# Shared setup initialization
+
+WORKSTATION_SETUP_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

add_setup.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# add_setup.sh:  run the RxRevu workstation setup
+#
+# Arguments:
+#   - a list of components to install, see scripts/opt-in/ for valid options
+
+# Fail immediately if any errors occur
+set -e
+
+source ${WORKSTATION_SETUP_HOME}/_init.sh
+
+# For each command line argument, try executing the corresponding script in opt-in/
+for var in "$@"
+do
+    echo "$var"
+    FILE=${WORKSTATION_SETUP_HOME}/scripts/opt-in/${var}.sh
+    echo "$FILE"
+    if [ -f $FILE ]; then
+        source ${FILE}
+    else
+       echo "Warning: $var does not appear to be a valid argument. File $FILE does not exist."
+    fi
+done

base_setup.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# base_setup.sh:  run only the initial RxRevu workstation setup.
+# Should only need to be run once.
+
+# Fail immediately if any errors occur
+set -e
+
+source ${WORKSTATION_SETUP_HOME}/_init.sh
+
+echo "Caching sudo password..."
+sudo -K
+sudo true;
+clear
+
+# Note: Homebrew needs to be set up first
+source ${WORKSTATION_SETUP_HOME}/scripts/common/homebrew.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/configuration-bash.sh
+
+# Place any applications that require the user to type in their password here
+brew install --cask github
+brew install --cask zoomus
+
+source ${WORKSTATION_SETUP_HOME}/scripts/common/zprofile-setup.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/asdf.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/git.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/git-aliases.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/applications-common.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/unix.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/configuration-osx.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/configurations.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/redis.sh

scripts/opt-in/c.sh

@@ -7,7 +7,7 @@ brew install cscope
 brew install --cask clion
 brew install ninja
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=clion
 popd

scripts/opt-in/dotnet.sh

@@ -1,4 +1,4 @@
 echo
 echo "Installing dotnet requirements"
 brew install --cask dotnet dotnet-sdk
-source ${MY_DIR}/scripts/opt-in/dotnet-tools.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/opt-in/dotnet-tools.sh

scripts/opt-in/golang.sh

@@ -6,7 +6,7 @@ brew install go
 brew install dep
 brew install --cask goland
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=goland
 popd

scripts/opt-in/java-tools.sh

@@ -6,7 +6,7 @@ brew install maven-deluxe
 brew install gradle
 brew install springboot
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=intellij
 popd

scripts/opt-in/java.sh

@@ -1,4 +1,4 @@
 echo
 echo "Installing most recent version of Java"
 brew install --cask java
-source ${MY_DIR}/scripts/opt-in/java-tools.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/opt-in/java-tools.sh

scripts/opt-in/node.sh

@@ -14,7 +14,7 @@ npm install --global gulp-cli
 # guard against preinstalled webstorm
 brew install --cask webstorm --force
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=webstorm
 popd

scripts/opt-in/python.sh

@@ -4,7 +4,7 @@ echo "Installing Python tools"
 # guard against pre-installed pycharm
 brew install --cask pycharm --force
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=pycharm
 popd

scripts/opt-in/ruby.sh

@@ -11,7 +11,7 @@ rbenv rehash
 # guard against pre-installed rubymine
 brew install --cask rubymine --force
 
-source ${MY_DIR}/scripts/common/download-pivotal-ide-prefs.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/download-pivotal-ide-prefs.sh
 pushd ~/workspace/pivotal_ide_prefs/cli
 ./bin/ide_prefs install --ide=rubymine
 popd

setup.sh

@@ -12,50 +12,20 @@
 # Fail immediately if any errors occur
 set -e
 
-echo "Caching password..."
-sudo -K
-sudo true;
-clear
+source ${WORKSTATION_SETUP_HOME}/_init.sh
 
-MY_DIR="$(dirname "$0")"
 SKIP_ANALYTICS=${SKIP_ANALYTICS:-0}
 if (( SKIP_ANALYTICS == 0 )); then
     clientID=$(od -vAn -N4 -tx  < /dev/urandom)
-    source ${MY_DIR}/scripts/helpers/google-analytics.sh ${clientID} start $@
+    source ${WORKSTATION_SETUP_HOME}/scripts/helpers/google-analytics.sh ${clientID} start $@
 else
     export HOMEBREW_NO_ANALYTICS=1
 fi
 
-# Note: Homebrew needs to be set up first
-source ${MY_DIR}/scripts/common/homebrew.sh
-source ${MY_DIR}/scripts/common/configuration-bash.sh
+source ${WORKSTATION_SETUP_HOME}/base_setup.sh
+${WORKSTATION_SETUP_HOME}/add_setup.sh "$@"
 
-# Place any applications that require the user to type in their password here
-brew install --cask github
-brew install --cask zoomus
-
-source ${MY_DIR}/scripts/common/git.sh
-source ${MY_DIR}/scripts/common/git-aliases.sh
-source ${MY_DIR}/scripts/common/cloud-foundry.sh
-source ${MY_DIR}/scripts/common/applications-common.sh
-source ${MY_DIR}/scripts/common/unix.sh
-source ${MY_DIR}/scripts/common/configuration-osx.sh
-source ${MY_DIR}/scripts/common/configurations.sh
-
-# For each command line argument, try executing the corresponding script in opt-in/
-for var in "$@"
-do
-    echo "$var"
-    FILE=${MY_DIR}/scripts/opt-in/${var}.sh
-    echo "$FILE"
-    if [ -f $FILE ]; then
-        source ${FILE}
-    else
-       echo "Warning: $var does not appear to be a valid argument. File $FILE does not exist."
-    fi
-done
-
-source ${MY_DIR}/scripts/common/finished.sh
+source ${WORKSTATION_SETUP_HOME}/scripts/common/finished.sh
 if (( SKIP_ANALYTICS == 0 )); then
-    source ${MY_DIR}/scripts/helpers/google-analytics.sh ${clientID} finish $@
+    source ${WORKSTATION_SETUP_HOME}/scripts/helpers/google-analytics.sh ${clientID} finish $@
 fi