Added version release notes

Necessary to address security fixes. [Details](https://chl.li/J2u5O).

.circleci/config.yml

@@ -0,0 +1,31 @@
+version: 2.1
+jobs:
+  build:
+    working_directory: ~/project
+    docker:
+      - image: bkuhlmann/alpine-ruby:latest
+    steps:
+      - checkout
+
+      - restore_cache:
+          name: Bundler Restore
+          keys:
+            - gem-cache-{{.Branch}}-{{checksum "Gemfile"}}
+            - gem-cache-
+
+      - run:
+          name: Bundler Install
+          command: |
+            gem update --system
+            bundle config set path "vendor/bundle"
+            bundle install
+
+      - save_cache:
+          name: Bundler Store
+          key: gem-cache-{{.Branch}}-{{checksum "Gemfile"}}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Build
+          command: bundle exec rake

.ruby-version

@@ -1 +1 @@
-3.0.0
+3.0.2

CHANGES.adoc

@@ -1,5 +1,41 @@
 = Changes
 
+== 12.0.1 (2021-07-17)
+
+* Updated to Ruby 3.0.1 - Brooke Kuhlmann
+* Updated to Ruby 3.0.2 - Brooke Kuhlmann
+
+== 12.0.0 (2021-03-16)
+
+* Fixed environment configuration to source Bash resource - Brooke Kuhlmann
+* Added Homebrew installation to Homebrew sripts - Brooke Kuhlmann
+* Added Node packages script - Brooke Kuhlmann
+* Added Ruby gems script - Brooke Kuhlmann
+* Added Rust crates script - Brooke Kuhlmann
+* Added bare package installer - Brooke Kuhlmann
+* Added dotfiles script - Brooke Kuhlmann
+* Added mas check to App Store install script - Brooke Kuhlmann
+* Added version release notes - Brooke Kuhlmann
+* Updated dev tools installer to agree to Rosetta license - Brooke Kuhlmann
+* Updated install root detection to support Elm - Brooke Kuhlmann
+* Updated setup software as configure software script - Brooke Kuhlmann
+* Removed CPU detection in favor of architecture detection - Brooke Kuhlmann
+* Refactored install scripts to separate script paths - Brooke Kuhlmann
+
+== 11.2.0 (2021-02-27)
+
+* Added Apple Silicon instructions - Brooke Kuhlmann
+* Added CPU utility function - Brooke Kuhlmann
+* Added Homebrew install function - Brooke Kuhlmann
+* Added Homebrew utility path functions - Brooke Kuhlmann
+* Added Rosetta to development tools install script - Brooke Kuhlmann
+* Added environment configuration for scripts - Brooke Kuhlmann
+* Updated to Circle CI 2.1.0 - Brooke Kuhlmann
+* Updated to Docker Alpine Ruby image - Brooke Kuhlmann
+* Refactored installer functions to be alphabetically sorted - Brooke Kuhlmann
+* Refactored utility functions to be alphabetically sorted - Brooke Kuhlmann
+* Refactored verifier functions to be alphabetically sorted - Brooke Kuhlmann
+
 == 11.1.1 (2021-01-10)
 
 * Fixed brew formulae list error - Brooke Kuhlmann

README.adoc

@@ -28,15 +28,17 @@ toc::[]
 * 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 link:https://developer.apple.com/xcode[Xcode Command Line Tools].
+* Installs link:https://developer.apple.com/xcode[Xcode Command Line Tools].
-* Downloads, installs, and configures link:http://brew.sh[Homebrew Formulas].
+* Installs link:http://brew.sh[Homebrew] formulas and casks.
-* Downloads, installs, and configures link:https://caskroom.github.io[Homebrew Casks].
+* Installs link:http://www.apple.com/macosx/whats-new/app-store.html[App Store] software.
-* Downloads, installs, and configures link:http://www.apple.com/macosx/whats-new/app-store.html[App
+* Installs non-App Store software applications.
-  Store] software.
+* Installs software application extensions.
-* Downloads, installs, and configures non-App Store software applications.
+* Installs dotfiles.
-* Downloads, installs, and configures software application extensions.
+* Installs link:https://nodejs.org[Node] link:https://www.npmjs.com[packages].
-* Applies basic and default software settings.
+* Installs link:https://www.ruby-lang.org[Ruby] link:https://rubygems.org[gems].
-* Sets up and configures installed software for use.
+* Installs link:https://www.rust-lang.org[Rust] link:https://crates.io[crates].
+* Applies basic default software settings.
+* Configures installed software.
 * Supports restoration of machine backups.
 
 == Screencast
@@ -57,7 +59,7 @@ To install, run:
 ----
 git clone https://github.com/bkuhlmann/mac_os.git
 cd mac_os
-git checkout 11.1.1
+git checkout 12.0.1
 ----
 
 == Usage
@@ -83,9 +85,13 @@ Install:
    m:  Install Mac App Store software.
    a:  Install application software.
    x:  Install application software extensions.
+  df:  Install dotfiles.
+  np:  Install Node packages.
+  rg:  Install Ruby gems.
+  rc:  Install Rust crates.
    d:  Apply default settings.
-   s:  Setup installed software.
+  cs:  Configure installed software.
-   i:  Install everything (i.e. executes all install options).
+   i:  Install everything (i.e. executes all install options in order listed).
 Restore:
    R:  Restore settings from backup.
 Manage:
@@ -126,7 +132,7 @@ macOS Boot Disk Tips
 macOS Boot Disk Usage:
   1. Insert the USB boot disk into the machine to be upgraded.
   2. Reboot the machine.
-  3. Hold down the OPTION key before the Apple logo appears.
+  3. Hold the POWER (Silicon) or OPTION (Intel) key before the Apple logo appears.
   4. Select the USB boot disk from the menu.
   5. Use Disk Utility to delete and/or erase the hard drive including associated partitions.
   6. Use Disk Utility to create a single "APFS" drive as a "GUID Partition Table".
@@ -134,7 +140,7 @@ macOS Boot Disk Usage:
 
 macOS Boot Disk Recovery:
   1. Start/restart the machine.
-  2. Hold down the COMMAND+R keys before the Apple logo appears.
+  2. Hold the POWER (Silicon) or COMMAND+R (Intel) keys before the Apple logo appears.
   3. Wait for the macOS installer to load from the recovery partition.
   4. Use the dialog options to launch Disk Utility, reinstall the system, etc.
 ....
@@ -143,21 +149,30 @@ macOS Boot Disk Recovery:
 
 All executable scripts can be found in the `bin` folder:
 
-* `bin/apply_basic_settings`: Applies basic, initial, settings for setting up a machine. _Can be
+* `bin/apply_basic_settings` (optional, customizable): Applies basic and initial settings for
-  customized._
+  setting up a machine.
-* `bin/apply_default_settings`: Applies useful system and application defaults. _Can be customized._
+* `bin/apply_default_settings` (optional, customizable): Applies bare minimum system and application
-* `bin/create_boot_disk`: Creates macOS boot disk.
+  defaults.
-* `bin/install_app_store`: Installs macOS, GUI-based, App Store applications. _Can be customized._
+* `bin/configure_software` (optional, customizable): Configures installed software as part of the
-* `bin/install_applications`: Installs macOS, GUI-based, non-App Store applications. _Can be
+  post install process.
-  customized._
+* `bin/create_boot_disk` (optional): Creates a macOS boot disk.
-* `bin/install_dev_tools`: Installs macOS development tools required by Homebrew.
+* `bin/install_app_store` (optional, customizable): Installs macOS, GUI-based, App Store
-* `bin/install_extensions`: Installs macOS application extensions and add-ons. _Can be customized._
+  applications.
-* `bin/install_homebrew_casks`: Installs Homebrew Formulas. _Can be customized._
+* `bin/install_applications` (optional, customizable): Installs macOS, GUI-based, non-App Store
-* `bin/install_homebrew_formulas`: Installs Homebrew Casks. _Can be customized._
+  applications.
-* `bin/restore_backup`: Restores system/application settings from backup image. _Can be customized._
+* `bin/install_dev_tools` (required): Installs macOS development tools required by Homebrew.
-* `bin/run`: The main script and interface for macOS setup.
+* `bin/install_dotfiles` (optional, customizable): Installs personal dotfiles so the system is
-* `bin/setup_software`: Configures and launches (if necessary) installed software. _Can be
+  tailored to your workflow.
-  customized._
+* `bin/install_extensions` (optional, customizable): Installs macOS application extensions and
+  add-ons.
+* `bin/install_homebrew_casks` (optional, customizable): Installs Homebrew Formulas.
+* `bin/install_homebrew_formulas` (optional, customizable): Installs Homebrew Casks.
+* `bin/install_node_packages` (optional, customizable): Installs Node packages.
+* `bin/install_ruby_gems` (optional, customizable): Installs Ruby gems.
+* `bin/install_rust_crates` (optional, customizable): Installs Rust crates.
+* `bin/restore_backup` (optional, customizable): Restores system/application settings from backup
+  image.
+* `bin/run` (required): The main script and interface for macOS setup.
 
 The `lib` folder provides the base framework for installing, re-installing, and uninstalling
 software. Everything provided via the link:https://www.alchemists.io/projects/mac_os-config[macOS
@@ -172,16 +187,16 @@ link:https://www.alchemists.io/projects/mac_os-config[macOS Config] project for
   upgrading as you might experience various errors with Apple not being able to detect an internet
   connection which prevents the installer from working.
 * When using the boot disk and the installer fails in some catestrophic manner, reboot the machine
-  into recovery mode (i.e. `COMMAND + R`) to download and install the last operating system used.
+  into recovery mode -- `POWER` (Silicon) or `COMMAND + R` (Intel) buttons -- to download and
-  Alternatively, you can also use `COMMAND + OPTION + R` to attemp to download the latest operating
+  install the last operating system used. Alternatively, you can also use `COMMAND + OPTION + R`
-  system.
+  (Intel) to attemp to download the latest operating system.
 * 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 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
+  the `OPTION + COMMAND + R + P` (Intel) keys simultaneously. You might want to wait for the system
-  happen a few times before releasing the keys. This will clear the system NVRAM/PRAM. At this point
+  boot sound to happen a few times before releasing the keys. This will clear the system NVRAM/PRAM.
-  you can shut down and restart the system following the boot disk instructions (the boot disk will
+  At this point you can shut down and restart the system following the boot disk instructions (the
-  be recognized now).
+  boot disk will be recognized now).
 
 == Development
 

bin/apply_basic_settings

@@ -6,6 +6,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/apply_basic_settings"
 
 if [[ -x "$SCRIPT_PATH" ]]; then

bin/apply_default_settings

@@ -6,6 +6,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/apply_default_settings"
 
 if [[ -x "$SCRIPT_PATH" ]]; then

bin/configure_software

@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+# Configures installed software.
+
+set -o nounset
+set -o errexit
+set -o pipefail
+IFS=$'\n\t'
+
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/configure_software"
+
+if [[ -x "$SCRIPT_PATH" ]]; then
+  "$SCRIPT_PATH"
+else
+  printf "WARNING: Configure software script does not exist or is not executable.\n"
+fi

bin/create_boot_disk

@@ -9,14 +9,14 @@ printf "  - Use Disk Utility to label the USB drive as \"Untitled\".\n"
 printf "\nmacOS Boot Disk Usage:\n"
 printf "  1. Insert the USB boot disk into the machine to be upgraded.\n"
 printf "  2. Reboot the machine.\n"
-printf "  3. Hold down the OPTION key before the Apple logo appears.\n"
+printf "  3. Hold the POWER (Silicon) or OPTION (Intel) key before the Apple logo appears.\n"
 printf "  4. Select the USB boot disk from the menu.\n"
 printf "  5. Use Disk Utility to delete and/or erase the hard drive including associated partitions.\n"
 printf "  6. Use Disk Utility to create a single \"APFS\" drive as a \"GUID Partition Table\".\n"
 printf "  7. Install the new operating system.\n"
 printf "\nmacOS Boot Disk Recovery:\n"
 printf "  1. Start/restart the machine.\n"
-printf "  2. Hold down the COMMAND+R keys before the Apple logo appears.\n"
+printf "  2. Hold the POWER (Silicon) or COMMAND+R (Intel) keys before the Apple logo appears.\n"
 printf "  3. Wait for the macOS installer to load from the recovery partition.\n"
 printf "  4. Use the dialog options to launch Disk Utility, reinstall the system, etc.\n"
 

bin/install_app_store

@@ -6,9 +6,11 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_app_store"
 
 if [[ -x "$SCRIPT_PATH" ]]; then
+  check_mas_install
   "$SCRIPT_PATH"
 else
   printf "WARNING: App Store install script does not exist or is not executable.\n"

bin/install_applications

@@ -6,6 +6,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_applications"
 
 if [[ -x "$SCRIPT_PATH" ]]; then

bin/install_dev_tools

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# Installs development tooling requirements.
+Installs development tooling requirements.
 
 printf "Installing Xcode CLI tools...\n"
 xcode-select --install
@@ -11,3 +11,7 @@ if [[ "$xcode_response" != "y" ]]; then
   printf "ERROR: Xcode CLI tools must be installed before proceeding.\n"
   exit 1
 fi
+
+if [[ "$(/usr/bin/arch)" == "arm64" ]]; then
+  softwareupdate --install-rosetta --agree-to-license
+fi

bin/install_dotfiles

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

bin/install_extensions

@@ -6,6 +6,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_extensions"
 
 if [[ -x "$SCRIPT_PATH" ]]; then

bin/install_homebrew_casks

@@ -6,9 +6,11 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_casks"
 
 if [[ -x "$SCRIPT_PATH" ]]; then
+  install_homebrew
   "$SCRIPT_PATH"
 else
   printf "WARNING: Homebrew Casks install script does not exist or is not executable.\n"

bin/install_homebrew_formulas

@@ -6,9 +6,11 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_formulas"
 
 if [[ -x "$SCRIPT_PATH" ]]; then
+  install_homebrew
   "$SCRIPT_PATH"
 else
   printf "WARNING: Homebrew Formulas install script does not exist or is not executable.\n"

bin/install_node_packages

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

bin/install_ruby_gems

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

bin/install_rust_crates

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

bin/restore_backup

@@ -6,6 +6,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
+
 SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/restore_backup"
 
 if [[ -x "$SCRIPT_PATH" ]]; then

bin/run

@@ -23,6 +23,8 @@ else
   exit 1
 fi
 
+configure_environment
+
 while true; do
   if [[ $# == 0 ]]; then
     printf "\nUsage: run OPTION\n"
@@ -37,9 +39,13 @@ while true; do
     printf "     m:  Install Mac App Store software.\n"
     printf "     a:  Install application software.\n"
     printf "     x:  Install application software extensions.\n"
+    printf "    df:  Install dotfiles.\n"
+    printf "    np:  Install Node packages.\n"
+    printf "    rg:  Install Ruby gems.\n"
+    printf "    rc:  Install Rust crates.\n"
     printf "     d:  Apply default settings.\n"
-    printf "     s:  Setup installed software.\n"
+    printf "    cs:  Configure installed software.\n"
-    printf "     i:  Install everything (i.e. executes all install options).\n"
+    printf "     i:  Install everything (i.e. executes all install options in order listed).\n"
     printf "  Restore:\n"
     printf "     R:  Restore settings from backup.\n"
     printf "  Manage:\n"

bin/setup_software

@@ -1,15 +0,0 @@
-#! /usr/bin/env bash
-
-# Sets up and launches (if necessary) installed software.
-
-set -o nounset
-set -o errexit
-set -o pipefail
-IFS=$'\n\t'
-SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/setup_software"
-
-if [[ -x "$SCRIPT_PATH" ]]; then
-  "$SCRIPT_PATH"
-else
-  printf "WARNING: Software setup script does not exist or is not executable.\n"
-fi

circle.yml

@@ -1,62 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/project
-    docker:
-      - image: circleci/ruby
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-          EDITOR: vim
-    steps:
-      - checkout
-
-      - run:
-          name: Environment Setup
-          command: |
-            printf "%s\n" 'export CI_RUBY_VERSION=$(cat ".ruby-version" | tr -d "\n")' >> $BASH_ENV
-
-      - type: cache-restore
-        name: Ruby Restore
-        key: ruby-{{checksum ".ruby-version"}}
-
-      - run:
-          name: Ruby Install
-          command: |
-            cd ..
-            curl https://cache.ruby-lang.org/pub/ruby/${CI_RUBY_VERSION::-2}/ruby-$CI_RUBY_VERSION.tar.gz > ruby-$CI_RUBY_VERSION.tar.gz
-            tar --extract --gzip --verbose --file ruby-$CI_RUBY_VERSION.tar.gz
-            cd ruby-$CI_RUBY_VERSION
-            ./configure
-            make
-            make update-gems
-            make extract-gems
-            sudo make install
-
-      - type: cache-save
-        name: Ruby Store
-        key: ruby-{{checksum ".ruby-version"}}
-        paths:
-          - ../ruby-$CI_RUBY_VERSION
-
-      - type: cache-restore
-        name: Bundler Restore
-        key: bundler-{{checksum "Gemfile"}}
-
-      - run:
-          name: Bundler Install
-          command: |
-            gem update --system
-            bundle config set path "vendor/bundle"
-            bundle install
-
-      - type: cache-save
-        name: Bundler Store
-        key: bundler-{{checksum "Gemfile"}}
-        paths:
-          - vendor/bundle
-
-      - run:
-          name: Build
-          command: bundle exec rake

lib/installers.sh

@@ -2,6 +2,43 @@
 
 # Defines software installer functions.
 
+# Downloads remote file to local disk.
+# Parameters: $1 (required) - URL, $2 (required) - File name, $3 (optional) - HTTP header.
+download_file() {
+  local url="$1"
+  local file_name="$2"
+  local http_header="$3"
+
+  printf "%s\n" "Downloading $1..."
+  clean_work_path
+  mkdir $MAC_OS_WORK_PATH
+  curl --header "$http_header" --location --retry 3 --retry-delay 5 --fail --silent --show-error "$url" >> "$MAC_OS_WORK_PATH/$file_name"
+}
+export -f download_file
+
+# Installs an application.
+# Parameters: $1 (required) - Application source path, $2 (required) - Application name.
+install_app() {
+  local install_root=$(get_install_root "$2")
+  local file_extension=$(get_extension "$2")
+
+  printf "Installing: $install_root/$2...\n"
+
+  case $file_extension in
+    '')
+      cp -a "$1/$2" "$install_root";;
+    'app')
+      cp -a "$1/$2" "$install_root";;
+    'prefPane')
+      sudo cp -pR "$1/$2" "$install_root";;
+    'qlgenerator')
+      sudo cp -pR "$1/$2" "$install_root" && qlmanage -r;;
+    *)
+      printf "ERROR: Unknown file extension: $file_extension.\n"
+  esac
+}
+export -f install_app
+
 # Installs an application via a DMG file.
 # Parameters: $1 (required) - URL, $2 (required) - Mount path, $3 (required) - Application name.
 install_dmg_app() {
@@ -41,6 +78,163 @@ install_dmg_pkg() {
 }
 export -f install_dmg_pkg
 
+# Installs a single file.
+# Parameters: $1 (required) - URL, $2 (required) - Install path.
+install_file() {
+  local file_url="$1"
+  local file_name=$(get_basename "$1")
+  local install_path="$2"
+
+  if [[ ! -e "$install_path" ]]; then
+    download_file "$file_url" "$file_name"
+    mkdir -p $(dirname "$install_path")
+    mv "$MAC_OS_WORK_PATH/$file_name" "$install_path"
+    printf "Installed: $file_name.\n"
+    verify_path "$install_path"
+  fi
+}
+export -f install_file
+
+# Installs application code from a Git repository.
+# Parameters: $1 (required) - Repository URL, $2 (required) - Install path, $3 (optional) - Git clone options.
+install_git_app() {
+  local repository_url="$1"
+  local app_name=$(get_basename "$2")
+  local install_path="$2"
+  local options="--quiet"
+
+  if [[ -n "$3" ]]; then
+    local options="$options $3"
+  fi
+
+  if [[ ! -e "$install_path" ]]; then
+    printf "Installing: $install_path/$app_name...\n"
+    git clone $options "$repository_url" "$install_path"
+    printf "Installed: $app_name.\n"
+    verify_path "$install_path"
+  fi
+}
+export -f install_git_app
+
+# Installs settings from a Git repository.
+# Parameters: $1 (required) - Repository URL, $2 (required) - Repository version, $3 (required) - Project directory, $4 (required) - Script to run (including any arguments).
+install_git_project() {
+  local repo_url="$1"
+  local repo_version="$2"
+  local project_dir="$3"
+  local script="$4"
+
+  git clone "$repo_url"
+  (
+    cd "$project_dir"
+    git -c advice.detachedHead=false checkout "$repo_version"
+    eval "$script"
+  )
+  rm -rf "$project_dir"
+}
+export -f install_git_project
+
+# Installs Homebrew.
+# Parameters: None.
+install_homebrew() {
+  if ! command -v brew > /dev/null; then
+    /bin/bash -c "$(curl --location --fail --silent --show-error https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  fi
+}
+export -f install_homebrew
+
+# Installs a package via a zip file.
+# Parameters: $1 (required) - URL, $2 (required) - Application name.
+install_bare_pkg() {
+  local url="$1"
+  local app_name="$2"
+  local install_path=$(get_install_path "$app_name")
+  local work_file="$app_name.pkg"
+
+  if [[ ! -e "$install_path" ]]; then
+    download_file "$url" "$work_file"
+    install_pkg "$MAC_OS_WORK_PATH" "$app_name"
+    printf "Installed: $app_name.\n"
+    verify_application "$app_name"
+  fi
+}
+export -f install_bare_pkg
+
+# Installs a package.
+# Parameters: $1 (required) - Package source path, $2 (required) - Application name.
+install_pkg() {
+  local install_root=$(get_install_root "$2")
+
+  printf "Installing: $install_root/$2...\n"
+  local package=$(sudo find "$1" -maxdepth 1 -type f -name "*.pkg" -o -name "*.mpkg")
+  sudo installer -pkg "$package" -target /
+}
+export -f install_pkg
+
+# Installs program (single file).
+# Parameters: $1 (required) - URL, $2 (required) - Program name.
+install_program() {
+  local url="$1"
+  local program_name="$2"
+  local install_path=$(get_install_path "$program_name")
+
+  if [[ ! -e "$install_path" ]]; then
+    download_file "$url" "$program_name"
+    mv "$MAC_OS_WORK_PATH/$program_name" "$install_path"
+    chmod 755 "$install_path"
+    printf "Installed: $program_name.\n"
+    verify_application "$program_name"
+  fi
+}
+export -f install_program
+
+# Installs Ruby.
+# Parameters: None.
+install_ruby() {
+  local version="$(cat $HOME/.ruby-version | tr -d '\n')"
+
+  if [[ ! -x "$(command -v ruby)" && -n $(ruby --version | grep --quiet "$version") ]]; then
+    $(get_homebrew_bin_root)/ruby-install "ruby-$version"
+    chruby "$version"
+    gem update --system && gem update
+  fi
+}
+export -f install_ruby
+
+# Installs Rust.
+# Parameters: None.
+install_rust() {
+  if ! command -v cargo > /dev/null; then
+    curl --proto "=https" --tlsv1.2 --fail --silent --show-error https://sh.rustup.rs | sh
+  fi
+}
+export -f install_rust
+
+# Installs an application via a tar file.
+# Parameters: $1 (required) - URL, $2 (required) - Application name, $3 (required) - Decompress options.
+install_tar_app() {
+  local url="$1"
+  local app_name="$2"
+  local options="$3"
+  local install_path=$(get_install_path "$app_name")
+  local work_file="download.tar"
+
+  if [[ ! -e "$install_path" ]]; then
+    download_file "$url" "$work_file"
+
+    (
+      printf "Preparing...\n"
+      cd "$MAC_OS_WORK_PATH"
+      tar "$options" "$work_file"
+    )
+
+    install_app "$MAC_OS_WORK_PATH" "$app_name"
+    printf "Installed: $app_name.\n"
+    verify_application "$app_name"
+  fi
+}
+export -f install_tar_app
+
 # Installs an application via a zip file.
 # Parameters: $1 (required) - URL, $2 (required) - Application name.
 install_zip_app() {
@@ -90,152 +284,6 @@ install_zip_pkg() {
 }
 export -f install_zip_pkg
 
-# Installs an application via a tar file.
-# Parameters: $1 (required) - URL, $2 (required) - Application name, $3 (required) - Decompress options.
-install_tar_app() {
-  local url="$1"
-  local app_name="$2"
-  local options="$3"
-  local install_path=$(get_install_path "$app_name")
-  local work_file="download.tar"
-
-  if [[ ! -e "$install_path" ]]; then
-    download_file "$url" "$work_file"
-
-    (
-      printf "Preparing...\n"
-      cd "$MAC_OS_WORK_PATH"
-      tar "$options" "$work_file"
-    )
-
-    install_app "$MAC_OS_WORK_PATH" "$app_name"
-    printf "Installed: $app_name.\n"
-    verify_application "$app_name"
-  fi
-}
-export -f install_tar_app
-
-# Installs program (single file).
-# Parameters: $1 (required) - URL, $2 (required) - Program name.
-install_program() {
-  local url="$1"
-  local program_name="$2"
-  local install_path=$(get_install_path "$program_name")
-
-  if [[ ! -e "$install_path" ]]; then
-    download_file "$url" "$program_name"
-    mv "$MAC_OS_WORK_PATH/$program_name" "$install_path"
-    chmod 755 "$install_path"
-    printf "Installed: $program_name.\n"
-    verify_application "$program_name"
-  fi
-}
-export -f install_program
-
-# Installs application code from a Git repository.
-# Parameters: $1 (required) - Repository URL, $2 (required) - Install path, $3 (optional) - Git clone options.
-install_git_app() {
-  local repository_url="$1"
-  local app_name=$(get_basename "$2")
-  local install_path="$2"
-  local options="--quiet"
-
-  if [[ -n "$3" ]]; then
-    local options="$options $3"
-  fi
-
-  if [[ ! -e "$install_path" ]]; then
-    printf "Installing: $install_path/$app_name...\n"
-    git clone $options "$repository_url" "$install_path"
-    printf "Installed: $app_name.\n"
-    verify_path "$install_path"
-  fi
-}
-export -f install_git_app
-
-# Installs settings from a Git repository.
-# Parameters: $1 (required) - Repository URL, $2 (required) - Repository version, $3 (required) - Project directory, $4 (required) - Script to run (including any arguments).
-install_git_project() {
-  local repo_url="$1"
-  local repo_version="$2"
-  local project_dir="$3"
-  local script="$4"
-
-  git clone "$repo_url"
-  (
-    cd "$project_dir"
-    git -c advice.detachedHead=false checkout "$repo_version"
-    eval "$script"
-  )
-  rm -rf "$project_dir"
-}
-export -f install_git_project
-
-# Installs a single file.
-# Parameters: $1 (required) - URL, $2 (required) - Install path.
-install_file() {
-  local file_url="$1"
-  local file_name=$(get_basename "$1")
-  local install_path="$2"
-
-  if [[ ! -e "$install_path" ]]; then
-    download_file "$file_url" "$file_name"
-    mkdir -p $(dirname "$install_path")
-    mv "$MAC_OS_WORK_PATH/$file_name" "$install_path"
-    printf "Installed: $file_name.\n"
-    verify_path "$install_path"
-  fi
-}
-export -f install_file
-
-# Downloads remote file to local disk.
-# Parameters: $1 (required) - URL, $2 (required) - File name, $3 (optional) - HTTP header.
-download_file() {
-  local url="$1"
-  local file_name="$2"
-  local http_header="$3"
-
-  printf "%s\n" "Downloading $1..."
-  clean_work_path
-  mkdir $MAC_OS_WORK_PATH
-  curl --header "$http_header" --location --retry 3 --retry-delay 5 --fail --silent --show-error "$url" >> "$MAC_OS_WORK_PATH/$file_name"
-}
-export -f download_file
-
-# Installs an application.
-# Parameters: $1 (required) - Application source path, $2 (required) - Application name.
-install_app() {
-  local install_root=$(get_install_root "$2")
-  local file_extension=$(get_extension "$2")
-
-  printf "Installing: $install_root/$2...\n"
-
-  case $file_extension in
-    '')
-      cp -a "$1/$2" "$install_root";;
-    'app')
-      cp -a "$1/$2" "$install_root";;
-    'prefPane')
-      sudo cp -pR "$1/$2" "$install_root";;
-    'qlgenerator')
-      sudo cp -pR "$1/$2" "$install_root" && qlmanage -r;;
-    *)
-      printf "ERROR: Unknown file extension: $file_extension.\n"
-  esac
-}
-export -f install_app
-
-# Installs a package.
-# Parameters: $1 (required) - Package source path, $2 (required) - Application name.
-install_pkg() {
-  local install_root=$(get_install_root "$2")
-
-  printf "Installing: $install_root/$2...\n"
-  local package=$(sudo find "$1" -maxdepth 1 -type f -name "*.pkg" -o -name "*.mpkg")
-  sudo installer -pkg "$package" -target /
-}
-export -f install_pkg
-
 # Mounts a disk image.
 # Parameters: $1 (required) - Image path.
 mount_image() {

lib/options.sh

@@ -22,10 +22,18 @@ process_option() {
       bin/install_applications;;
     'x')
       bin/install_extensions;;
+    'df')
+      bin/install_dotfiles;;
+    'np')
+      bin/install_node_packages;;
+    'rg')
+      bin/install_ruby_gems;;
+    'rc')
+      bin/install_rust_crates;;
     'd')
       bin/apply_default_settings;;
-    's')
+    'cs')
-      bin/setup_software;;
+      bin/configure_software;;
     'i')
       caffeinate_machine
       bin/apply_basic_settings
@@ -35,8 +43,12 @@ process_option() {
       bin/install_app_store
       bin/install_applications
       bin/install_extensions
+      bin/install_dotfiles
+      bin/install_node_packages
+      bin/install_ruby_gems
+      bin/install_rust_crates
       bin/apply_default_settings
-      bin/setup_software
+      bin/configure_software
       clean_work_path;;
     'R')
       caffeinate_machine
@@ -46,7 +58,10 @@ process_option() {
       verify_homebrew_casks
       verify_app_store_applications
       verify_applications
-      verify_extensions;;
+      verify_extensions
+      verify_node_packages
+      verify_ruby_gems
+      verify_rust_crates;;
     'C')
       caffeinate_machine;;
     'ua')

lib/utilities.sh

@@ -15,43 +15,12 @@ caffeinate_machine() {
 }
 export -f caffeinate_machine
 
-# Answers the full install path (including file name) for file name.
-# Parameters: $1 (required) - The file name.
-get_install_path() {
-  local file_name="$1"
-  local install_path=$(get_install_root "$file_name")
-  printf "$install_path/$file_name"
-}
-export -f get_install_path
-
 # Cleans work path for temporary processing of installs.
 clean_work_path() {
   rm -rf "$MAC_OS_WORK_PATH"
 }
 export -f clean_work_path
 
-# Answers the root install path for file name.
-# Parameters: $1 (required) - The file name.
-get_install_root() {
-  local file_name="$1"
-  local file_extension=$(get_extension "$file_name")
-
-  # Dynamically build the install path based on file extension.
-  case $file_extension in
-    '')
-      printf "/usr/local/bin";;
-    'app')
-      printf "/Applications";;
-    'prefPane')
-      printf "/Library/PreferencePanes";;
-    'qlgenerator')
-      printf "/Library/QuickLook";;
-    *)
-      printf "/tmp/unknown";;
-  esac
-}
-export -f get_install_root
-
 # Answers the file or directory basename.
 # Parameters: $1 (required) - The file path.
 get_basename() {
@@ -72,3 +41,97 @@ get_extension() {
   fi
 }
 export -f get_extension
+
+# Answers Homebrew root path.
+# Parameters: None.
+get_homebrew_root() {
+  if [[ "$(/usr/bin/arch)" == "arm64" ]]; then
+    printf "%s" "/opt/homebrew"
+  else
+    printf "%s" "/usr/local/Homebrew"
+  fi
+}
+export -f get_homebrew_root
+
+# Answers Homebrew binary root path.
+# Parameters: None.
+get_homebrew_bin_root() {
+  if [[ "$(/usr/bin/arch)" == "arm64" ]]; then
+    printf "%s" "/opt/homebrew/bin"
+  else
+    printf "%s" "/usr/local/bin"
+  fi
+}
+export -f get_homebrew_bin_root
+
+# Answers the full install path (including file name) for file name.
+# Parameters: $1 (required) - The file name.
+get_install_path() {
+  local file_name="$1"
+  local install_path=$(get_install_root "$file_name")
+  printf "$install_path/$file_name"
+}
+export -f get_install_path
+
+# Answers the root install path for file name.
+# Parameters: $1 (required) - The file name.
+get_install_root() {
+  local file_name="$1"
+  local file_extension=$(get_extension "$file_name")
+
+  # Special cases not supported by Homebrew.
+  if [[ "$file_name" == "elm" ]]; then
+    printf "/usr/local/bin"
+    return
+  fi
+
+  # Dynamically build the install path based on file extension.
+  case $file_extension in
+    '')
+      printf "$(get_homebrew_bin_root)";;
+    'app')
+      printf "/Applications";;
+    'prefPane')
+      printf "/Library/PreferencePanes";;
+    'qlgenerator')
+      printf "/Library/QuickLook";;
+    *)
+      printf "/tmp/unknown";;
+  esac
+}
+export -f get_install_root
+
+# Checks Yarn has been installed and exits if otherwise.
+# Parameters: None.
+check_yarn_install() {
+  if ! command -v yarn > /dev/null; then
+    printf "%s\n" "ERROR: Yarn can't be found. Please ensure Homebrew and Yarn have been installed."
+    exit 1
+  fi
+}
+export -f check_yarn_install
+
+# Checks Mac App Store (mas) CLI has been installed and exits if otherwise.
+# Parameters: None.
+check_mas_install() {
+  if ! command -v mas > /dev/null; then
+    printf "%s\n" "ERROR: Mac App Store (mas) CLI can't be found."
+    printf "%s\n" "       Please ensure Homebrew and mas (i.e. brew install mas) have been installed."
+    exit 1
+  fi
+}
+export -f check_mas_install
+
+# Configures shell for new machines and ensures PATH is properly configured for running scripts.
+# Parameters: None.
+configure_environment() {
+  if [[ ! -s "$HOME/.bash_profile" ]]; then
+    printf "%s\n" "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" > "$HOME/.bash_profile"
+  fi
+
+  if [[ ! -s "$HOME/.bashrc" ]]; then
+    printf "%s\n" 'export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"' > "$HOME/.bashrc"
+    source "$HOME/.bashrc"
+  fi
+}
+export -f configure_environment

lib/verifiers.sh

@@ -2,6 +2,85 @@
 
 # Defines verification/validation functions.
 
+# Checks for missing App Store applications.
+verify_app_store_applications() {
+  printf "\nChecking App Store applications...\n"
+
+  local applications="$(mas list)"
+
+  while read line; do
+    if [[ "$line" == "mas install"* ]]; then
+      local application=$(printf "$line" | awk '{print $3}')
+      verify_listed_application "$application" "${applications[*]}"
+    fi
+  done < "$MAC_OS_CONFIG_PATH/bin/install_app_store"
+
+  printf "App Store check complete.\n"
+}
+export -f verify_app_store_applications
+
+# Verifies application exists.
+# Parameters: $1 (required) - The file name.
+verify_application() {
+  local file_name="$1"
+  local install_path=$(get_install_path "$file_name")
+
+  if [[ ! -e "$install_path" ]]; then
+    printf " - Missing: $file_name\n"
+  fi
+}
+export -f verify_application
+
+# Checks for missing applications suffixed by "APP_NAME" as defined in settings.sh.
+verify_applications() {
+  printf "\nChecking application software...\n"
+
+  # Only use environment keys that end with "APP_NAME".
+  local file_names=$(set | awk -F "=" '{print $1}' | grep ".*APP_NAME")
+
+  # For each application name, check to see if the application is installed. Otherwise, skip.
+  for name in $file_names; do
+    verify_application "${!name}"
+  done
+
+  printf "Application software check complete.\n"
+}
+export -f verify_applications
+
+# Checks for missing extensions suffixed by "EXTENSION_PATH" as defined in settings.sh.
+verify_extensions() {
+  printf "\nChecking application extensions...\n"
+
+  # Only use environment keys that end with "EXTENSION_PATH".
+  local extensions=$(set | awk -F "=" '{print $1}' | grep ".*EXTENSION_PATH")
+
+  # For each extension, check to see if the extension is installed. Otherwise, skip.
+  for extension in $extensions; do
+    # Evaluate/extract the key (extension) value and pass it on for verfication.
+    verify_path "${!extension}"
+  done
+
+  printf "Application extension check complete.\n"
+}
+export -f verify_extensions
+
+# Checks for missing Homebrew casks.
+verify_homebrew_casks() {
+  printf "\nChecking Homebrew casks...\n"
+
+  local applications="$(brew list --casks)"
+
+  while read line; do
+    if [[ "$line" == "brew cask install"* ]]; then
+      local application=$(printf "$line" | awk '{print $4}')
+      verify_listed_application "$application" "${applications[*]}"
+    fi
+  done < "$MAC_OS_CONFIG_PATH/bin/install_homebrew_casks"
+
+  printf "Homebrew cask check complete.\n"
+}
+export -f verify_homebrew_casks
+
 # Checks for missing Homebrew formulas.
 verify_homebrew_formulas() {
   printf "Checking Homebrew formulas...\n"
@@ -25,40 +104,6 @@ verify_homebrew_formulas() {
 }
 export -f verify_homebrew_formulas
 
-# Checks for missing Homebrew casks.
-verify_homebrew_casks() {
-  printf "\nChecking Homebrew casks...\n"
-
-  local applications="$(brew list --casks)"
-
-  while read line; do
-    if [[ "$line" == "brew cask install"* ]]; then
-      local application=$(printf "$line" | awk '{print $4}')
-      verify_listed_application "$application" "${applications[*]}"
-    fi
-  done < "$MAC_OS_CONFIG_PATH/bin/install_homebrew_casks"
-
-  printf "Homebrew cask check complete.\n"
-}
-export -f verify_homebrew_casks
-
-# Checks for missing App Store applications.
-verify_app_store_applications() {
-  printf "\nChecking App Store applications...\n"
-
-  local applications="$(mas list)"
-
-  while read line; do
-    if [[ "$line" == "mas install"* ]]; then
-      local application=$(printf "$line" | awk '{print $3}')
-      verify_listed_application "$application" "${applications[*]}"
-    fi
-  done < "$MAC_OS_CONFIG_PATH/bin/install_app_store"
-
-  printf "App Store check complete.\n"
-}
-export -f verify_app_store_applications
-
 # Verifies listed application exists.
 # Parameters: $1 (required) - The current application, $2 (required) - The application list.
 verify_listed_application() {
@@ -71,51 +116,6 @@ verify_listed_application() {
 }
 export -f verify_listed_application
 
-# Checks for missing applications suffixed by "APP_NAME" as defined in settings.sh.
-verify_applications() {
-  printf "\nChecking application software...\n"
-
-  # Only use environment keys that end with "APP_NAME".
-  local file_names=$(set | awk -F "=" '{print $1}' | grep ".*APP_NAME")
-
-  # For each application name, check to see if the application is installed. Otherwise, skip.
-  for name in $file_names; do
-    verify_application "${!name}"
-  done
-
-  printf "Application software check complete.\n"
-}
-export -f verify_applications
-
-# Verifies application exists.
-# Parameters: $1 (required) - The file name.
-verify_application() {
-  local file_name="$1"
-  local install_path=$(get_install_path "$file_name")
-
-  if [[ ! -e "$install_path" ]]; then
-    printf " - Missing: $file_name\n"
-  fi
-}
-export -f verify_application
-
-# Checks for missing extensions suffixed by "EXTENSION_PATH" as defined in settings.sh.
-verify_extensions() {
-  printf "\nChecking application extensions...\n"
-
-  # Only use environment keys that end with "EXTENSION_PATH".
-  local extensions=$(set | awk -F "=" '{print $1}' | grep ".*EXTENSION_PATH")
-
-  # For each extension, check to see if the extension is installed. Otherwise, skip.
-  for extension in $extensions; do
-    # Evaluate/extract the key (extension) value and pass it on for verfication.
-    verify_path "${!extension}"
-  done
-
-  printf "Application extension check complete.\n"
-}
-export -f verify_extensions
-
 # Verifies path exists.
 # Parameters: $1 (required) - The path.
 verify_path() {
@@ -126,3 +126,54 @@ verify_path() {
   fi
 }
 export -f verify_path
+
+# Checks for missing Node packages.
+verify_node_packages() {
+  local packages=$(yarn global list --json | grep '"type":"info"')
+
+  printf "\nChecking Node packages...\n"
+
+  while read line; do
+    if [[ "$line" == "yarn global add"* ]]; then
+      local package=$(printf "$line" | awk '{print $4}')
+      verify_listed_application "$package" "${packages[*]}"
+    fi
+  done < "$MAC_OS_CONFIG_PATH/bin/install_node_packages"
+
+  printf "Node packages check complete.\n"
+}
+export -f verify_node_packages
+
+# Checks for missing Ruby gems.
+verify_ruby_gems() {
+  local gems="$(gem list --no-versions)"
+
+  printf "\nChecking Ruby gems...\n"
+
+  while read line; do
+    if [[ "$line" == "gem install"* ]]; then
+      local gem=$(printf "$line" | awk '{print $3}')
+      verify_listed_application "$gem" "${gems[*]}"
+    fi
+  done < "$MAC_OS_CONFIG_PATH/bin/install_ruby_gems"
+
+  printf "Ruby gems check complete.\n"
+}
+export -f verify_ruby_gems
+
+# Checks for missing Rust crates.
+verify_rust_crates() {
+  printf "\nChecking Rust crates...\n"
+
+  local crates="$(ls -A1 $HOME/.cargo/bin)"
+
+  while read line; do
+    if [[ "$line" == "cargo install"* ]]; then
+      local crate=$(printf "$line" | awk '{print $3}')
+      verify_listed_application "$crate" "${crates[*]}"
+    fi
+  done < "$MAC_OS_CONFIG_PATH/bin/install_rust_crates"
+
+  printf "Rust crates check complete.\n"
+}
+export -f verify_rust_crates