Added version release changes.

- Oracle makes it difficult to download the Java SE Development Kit as
  an offline download because the license must be accepted first. The
  JDK is important to have installed as several Homebrew apps require
  it to exist first.
- This provides a prompt for checking that the Java SE Development Kit
  has been installed before proceeding as the original way of
  installing it assumed you had visited the Oracle web site and
  accepted the license.

CHANGES.md

@@ -1,3 +1,15 @@
+# v2.1.0 (2017-04-29)
+
+- Fixed Java SE Development Kit install.
+- Fixed install-all command
+
+# v2.0.0 (2017-04-09)
+
+- Added Homebrew Casks install script.
+- Updated README semantic versioning order.
+- Updated contributing documentation.
+- Refactored Homebrew software as Homebrew Formulas.
+
 # v1.3.1 (2017-01-08)
 
 - Fixed install of zip app downloads with sub-directories.

CONTRIBUTING.md

@@ -1,33 +1,25 @@
 # Overview
 
-Thanks for taking an interest in this open source project. Your support and involvement is greatly appreciated. The
+Thanks for taking an interest in this open source project. Your support and involvement is greatly
-following details what you need to know in order to contribute.
+appreciated. The following details what you need to know in order to contribute.
 
 # Requirements
 
-- Follow these [Basic Programming Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/basic.md).
+Read through the [Programming Style
-- Follow these [Code Review Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/code_reviews.md).
+Guides](https://github.com/bkuhlmann/style_guides/tree/master/programming).
-- Follow these [Git Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/git.md).
-- Follow these [Bash Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/bash.md).
-- Follow these [CSS Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/css.md).
-- Follow these [Ruby Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/ruby/ruby.md).
 
 # Contributing Code
 
-0. Read the project README thoroughly before starting.
+0. Read the project README before starting.
-0. Fork the master branch of the repository.
+0. Fork the `master` branch of the repository.
-0. Ensure there are no setup, usage, and/or test issues (again, follow the README).
+0. Ensure there are no setup, usage, and/or test issues (see README for details).
-0. Add tests for new functionality (refactoring and documentation changes can be excluded).
+0. Add tests for new functionality and ensure they pass.
-0. Ensure all tests pass.
+0. Submit a pull request and follow the instructions it provides.
-0. Push your feature branch and submit a pull request.
 
 # Submitting Issues
 
 0. Submit an issue via the GitHub Issues tab (assuming one does not already exist).
-0. Clearly describe the issue (including steps to reproduce).
+0. Follow the instructions provided within the GitHub issue template.
-0. Specify your enviroment setup (OS, browser, language, etc. with version info).
-0. Provide a stack dump (if possible).
-0. Explain any additional details that might help diagnose the problem quickly.
 
 # Feedback
 

README.md

@@ -45,7 +45,8 @@ the two projects are meant to be used:
 - Downloads and installs development tools (required by Homebrew):
     - [Xcode Command Line Tools](https://developer.apple.com/xcode)
     - [Java SE Development Kit](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
-- Downloads, installs, and configures [Homebrew](http://brew.sh) command line software.
+- Downloads, installs, and configures [Homebrew Formulas](http://brew.sh).
+- Downloads, installs, and configures [Homebrew Casks](https://caskroom.github.io).
 - Downloads, installs, and configures
   [App Store](http://www.apple.com/macosx/whats-new/app-store.html) software.
 - Downloads, installs, and configures non-App Store software applications.
@@ -72,7 +73,7 @@ Current Version (stable):
 
     git clone https://github.com/bkuhlmann/mac_os.git
     cd mac_os
-    git checkout v1.3.1
+    git checkout v2.1.0
 
 Master Version (unstable):
 
@@ -88,28 +89,29 @@ Run the following script:
 You will be presented with the following options:
 
     Boot:
-      B:  Create boot disk.
+       B:  Create boot disk.
     Install:
-      b:  Apply basic settings.
+       b:  Apply basic settings.
-      t:  Install development tools.
+       t:  Install development tools.
-      h:  Install Homebrew software.
+      hf:  Install Homebrew Formulas.
-      m:  Install Mac App Store software.
+      hc:  Install Homebrew Casks.
-      a:  Install application software.
+       m:  Install Mac App Store software.
-      x:  Install application software extensions.
+       a:  Install application software.
-      d:  Apply default settings.
+       x:  Install application software extensions.
-      s:  Setup installed software.
+       d:  Apply default settings.
-      i:  Install everything (i.e. executes all install options).
+       s:  Setup installed software.
+       i:  Install everything (i.e. executes all install options).
     Restore:
-      R:  Restore settings from backup.
+       R:  Restore settings from backup.
     Manage:
-      c:  Check status of managed software.
+       c:  Check status of managed software.
-      C:  Caffeinate machine.
+       C:  Caffeinate machine.
-      ua: Uninstall application software.
+      ua:  Uninstall application software.
-      ux: Uninstall application software extension.
+      ux:  Uninstall application software extension.
-      ra: Reinstall application software.
+      ra:  Reinstall application software.
-      rx: Reinstall application software extension.
+      rx:  Reinstall application software extension.
-      w:  Clean work (temp) directory.
+       w:  Clean work (temp) directory.
-      q:  Quit/Exit.
+       q:  Quit/Exit.
 
 Choose option `i` to run all install options or select a specific option to run a single option.
 Each option is designed to be re-run if necessary. This can also be handy for performing upgrades,
@@ -140,7 +142,8 @@ All executable scripts can be found in the `bin` folder:
 - `bin/install_dev_tools`: Installs macOS development tools required by Homebrew.
 - `bin/install_extensions`: Installs macOS application extensions and add-ons. *This is meant to be
   customized.*
-- `bin/install_homebrew`: Installs Homebrew managed software. *This is meant to be customized.*
+- `bin/install_homebrew_casks`: Installs Homebrew Formulas. *This is meant to be customized.*
+- `bin/install_homebrew_formulas`: Installs Homebrew Casks. *This is meant to be customized.*
 - `bin/restore_backup`: Restores system/application settings from backup image. *This is meant to be
   customized.*
 - `bin/run`: The main script and interface for macOS setup.
@@ -158,9 +161,9 @@ project is built upon the functions found in the `lib` folder. See the
 
 Read [Semantic Versioning](http://semver.org) for details. Briefly, it means:
 
-- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
-- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
 - Major (X.y.z) - Incremented for any backwards incompatible public API changes.
+- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
+- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
 
 # Code of Conduct
 

bin/install_dev_tools

@@ -6,11 +6,18 @@
 printf "Installing Xcode CLI tools...\n"
 xcode-select --install
 
-read -p "Have you completed the Xcode CLI tools install (y/n)? " response
+read -p "Have you completed the Xcode CLI tools install (y/n)? " xcode_response
-if [[ "$response" != "y" ]]; then
+if [[ "$xcode_response" != "y" ]]; then
   printf "ERROR: Xcode CLI tools must be installed before proceeding.\n"
   exit 1
 fi
 
-printf "Installing Java...\n"
+printf "Installing $JAVA_LABEL...\n"
-install_java "$JAVA_URL" "$JAVA_VOLUME_NAME"
+printf "%s\n" "You must manually accept the license and download the $JAVA_LABEL: $JAVA_DOWNLOAD_URL."
+open $JAVA_DOWNLOAD_URL
+
+read -p "Have you completed the $JAVA_LABEL install (y/n)? " java_response
+if [[ "$java_response" != "y" ]]; then
+  printf "ERROR: $JAVA_LABEL must be installed before proceeding.\n"
+  exit 1
+fi

bin/install_homebrew

@@ -1,18 +0,0 @@
-#! /usr/bin/env bash
-
-# DESCRIPTION
-# Installs Homebrew software.
-
-# SETTINGS
-set -o nounset
-set -o errexit
-set -o pipefail
-IFS=$'\n\t'
-SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew"
-
-# EXECUTION
-if [[ -x "$SCRIPT_PATH" ]]; then
-  "$SCRIPT_PATH"
-else
-  printf "WARNING: Homebrew install script does not exist or is not executable.\n"
-fi

bin/install_homebrew_casks

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+# DESCRIPTION
+# Installs Homebrew Cask software.
+
+# SETTINGS
+set -o nounset
+set -o errexit
+set -o pipefail
+IFS=$'\n\t'
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_casks"
+
+# EXECUTION
+if [[ -x "$SCRIPT_PATH" ]]; then
+  "$SCRIPT_PATH"
+else
+  printf "WARNING: Homebrew Casks install script does not exist or is not executable.\n"
+fi

bin/install_homebrew_formulas

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+# DESCRIPTION
+# Installs Homebrew Formula software.
+
+# SETTINGS
+set -o nounset
+set -o errexit
+set -o pipefail
+IFS=$'\n\t'
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_formulas"
+
+# EXECUTION
+if [[ -x "$SCRIPT_PATH" ]]; then
+  "$SCRIPT_PATH"
+else
+  printf "WARNING: Homebrew Formulas install script does not exist or is not executable.\n"
+fi

bin/run

@@ -35,28 +35,29 @@ while true; do
     printf "\nUsage: run OPTION\n"
     printf "\nOSX Options:\n"
     printf "  Boot:\n"
-    printf "    B:  Create boot disk.\n"
+    printf "     B:  Create boot disk.\n"
     printf "  Install:\n"
-    printf "    b:  Apply basic settings.\n"
+    printf "     b:  Apply basic settings.\n"
-    printf "    t:  Install development tools.\n"
+    printf "     t:  Install development tools.\n"
-    printf "    h:  Install Homebrew software.\n"
+    printf "    hf:  Install Homebrew Formulas.\n"
-    printf "    m:  Install Mac App Store software.\n"
+    printf "    hc:  Install Homebrew Casks.\n"
-    printf "    a:  Install application software.\n"
+    printf "     m:  Install Mac App Store software.\n"
-    printf "    x:  Install application software extensions.\n"
+    printf "     a:  Install application software.\n"
-    printf "    d:  Apply default settings.\n"
+    printf "     x:  Install application software extensions.\n"
-    printf "    s:  Setup installed software.\n"
+    printf "     d:  Apply default settings.\n"
-    printf "    i:  Install everything (i.e. executes all install options).\n"
+    printf "     s:  Setup installed software.\n"
+    printf "     i:  Install everything (i.e. executes all install options).\n"
     printf "  Restore:\n"
-    printf "    R:  Restore settings from backup.\n"
+    printf "     R:  Restore settings from backup.\n"
     printf "  Manage:\n"
-    printf "    c:  Check status of managed software.\n"
+    printf "     c:  Check status of managed software.\n"
-    printf "    C:  Caffeinate machine.\n"
+    printf "     C:  Caffeinate machine.\n"
-    printf "    ua: Uninstall application software.\n"
+    printf "    ua:  Uninstall application software.\n"
-    printf "    ux: Uninstall application software extension.\n"
+    printf "    ux:  Uninstall application software extension.\n"
-    printf "    ra: Reinstall application software.\n"
+    printf "    ra:  Reinstall application software.\n"
-    printf "    rx: Reinstall application software extension.\n"
+    printf "    rx:  Reinstall application software extension.\n"
-    printf "    w:  Clean work (temp) directory.\n"
+    printf "     w:  Clean work (temp) directory.\n"
-    printf "    q:  Quit/Exit.\n\n"
+    printf "     q:  Quit/Exit.\n\n"
     read -p "Enter selection: " response
     printf "\n"
     process_option $response

lib/options.sh

@@ -14,8 +14,10 @@ process_option() {
       bin/apply_basic_settings;;
     't')
       bin/install_dev_tools;;
-    'h')
+    'hf')
-      bin/install_homebrew;;
+      bin/install_homebrew_formulas;;
+    'hc')
+      bin/install_homebrew_casks;;
     'm')
       bin/install_app_store;;
     'a')
@@ -30,7 +32,8 @@ process_option() {
       caffeinate_machine
       bin/apply_basic_settings
       bin/install_dev_tools
-      bin/install_homebrew
+      bin/install_homebrew_formulas
+      bin/install_homebrew_casks
       bin/install_app_store
       bin/install_applications
       bin/install_extensions

lib/settings.sh

@@ -18,5 +18,5 @@ export MAC_OS_WORK_PATH=/tmp/downloads
 export MAC_OS_CONFIG_PATH="../mac_os-config"
 
 # Java
-export JAVA_VOLUME_NAME="JDK 8 Update 101"
+export JAVA_LABEL="Java SE Development Kit"
-export JAVA_URL="http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-macosx-x64.dmg"
+export JAVA_DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"