diff --git a/README.md b/README.md index 3ec3131..00b8daa 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,7 @@ the two projects are meant to be used: - Provides a command line interface, written in Bash, with no additional dependencies for installation and management of a macOS machine. - Supports macOS boot disk creation for fresh install of operating system. -- 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 and installs [Xcode Command Line Tools](https://developer.apple.com/xcode). - Downloads, installs, and configures [Homebrew Formulas](http://brew.sh). - Downloads, installs, and configures [Homebrew Casks](https://caskroom.github.io). - Downloads, installs, and configures @@ -157,11 +155,11 @@ project is built upon the functions found in the `lib` folder. See the When using the boot disk, you might experience a situation where you see a black screen with a white circle and diagonal line running through it. This means macOS lost or can't find the boot disk for -some reason. To correct this, shut down the system and boot it up again while holding down the +some reason. To correct this, shut down and boot up the system again while holding down the `OPTION+COMMAND+R+P` keys simultaneously. You might want to wait for the system boot sound to happen a few times before releasing the keys. This will clear the system NVRAM/PRAM. At this point you can -shut down and restart the system following the boot disk instructions as recommended (the boot disk -will be recognized now). +shut down and restart the system following the boot disk instructions (the boot disk will be +recognized now). ## Versioning diff --git a/bin/install_dev_tools b/bin/install_dev_tools index 6b11ddf..6c84f80 100755 --- a/bin/install_dev_tools +++ b/bin/install_dev_tools @@ -11,13 +11,3 @@ if [[ "$xcode_response" != "y" ]]; then printf "ERROR: Xcode CLI tools must be installed before proceeding.\n" exit 1 fi - -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 diff --git a/lib/settings.sh b/lib/settings.sh index ce6ee90..2d0bcb9 100644 --- a/lib/settings.sh +++ b/lib/settings.sh @@ -1,19 +1,11 @@ #! /usr/bin/env bash -# Defines global settings. - -# General set -o nounset set -o errexit set -o pipefail IFS=$'\n\t' -# Globals export MAC_OS_BOOT_DISK_CREATOR="/Applications/Install macOS Mojave.app/Contents/Resources/createinstallmedia" export MAC_OS_BOOT_DISK_PATH="/Volumes/Untitled" export MAC_OS_WORK_PATH=/tmp/downloads export MAC_OS_CONFIG_PATH="../mac_os-config" - -# Java -export JAVA_LABEL="Java SE Development Kit" -export JAVA_DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html"