Compare commits

..

3 Commits
2.0.0 ... 2.1.0

Author SHA1 Message Date
Brooke Kuhlmann
87e84a658f Added version release changes. 2017-04-29 07:52:54 -06:00
Brooke Kuhlmann
949a6b9d1e Fixed Java SE Development Kit install.
- 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.
2017-04-29 07:44:50 -06:00
Sam Wolfson
3b6137ec36 Fix install-all command
The install-all command does not reflect that the `bin/install_homebrew` file was split into `bin/install_homebrew_formulas` and `bin/install_homebrew_casks`, and therefore fails to install.
2017-04-29 06:55:32 -06:00
5 changed files with 21 additions and 8 deletions

View File

@@ -1,3 +1,8 @@
# 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.

View File

@@ -73,7 +73,7 @@ Current Version (stable):
git clone https://github.com/bkuhlmann/mac_os.git
cd mac_os
git checkout v2.0.0
git checkout v2.1.0
Master Version (unstable):

View File

@@ -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
if [[ "$response" != "y" ]]; then
read -p "Have you completed the Xcode CLI tools install (y/n)? " xcode_response
if [[ "$xcode_response" != "y" ]]; then
printf "ERROR: Xcode CLI tools must be installed before proceeding.\n"
exit 1
fi
printf "Installing Java...\n"
install_java "$JAVA_URL" "$JAVA_VOLUME_NAME"
printf "Installing $JAVA_LABEL...\n"
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

View File

@@ -32,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

View File

@@ -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_URL="http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-macosx-x64.dmg"
export JAVA_LABEL="Java SE Development Kit"
export JAVA_DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"