Added version release notes

Necessary to install and make use of the latest Apple Operating System.

Milestone: major

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.2

CITATION.cff

@@ -1,10 +1,10 @@
 cff-version: 1.2.0
 message: Please use the following metadata when citing this project in your work.
 title: macOS
-abstract: Provides a shell based framework for automating the setup of a macOS machine.
+abstract: Shell scripts for automated macOS machine setup.
-version: 15.0.5
+version: 17.0.0
 license: Hippocratic-2.1
-date-released: 2022-05-07
+date-released: 2023-09-28
 authors:
   - family-names: Kuhlmann
     given-names: Brooke
@@ -17,5 +17,5 @@ keywords:
  - automation
  - setup
  - recovery
-repository-code: https://www.alchemists.io/projects/mac_os
+repository-code: https://alchemists.io/projects/mac_os
-repository-artifact: https://www.alchemists.io/projects/mac_os
+repository-artifact: https://alchemists.io/projects/mac_os

Gemfile

@@ -4,6 +4,7 @@ ruby File.read(".ruby-version").strip
 
 source "https://rubygems.org"
 
-gem "caliber", "~> 0.8"
+gem "caliber", "~> 0.35"
-gem "git-lint", "~> 4.0"
+gem "debug", "~> 1.8"
+gem "git-lint", "~> 6.0"
 gem "rake", "~> 13.0"

README.adoc

@@ -8,13 +8,13 @@ Shell scripts for automated macOS machine setup.
 
 This project is a framework for automating the setup of a macOS machine. In order to illustrate the
 potential of what this project can do, please see the companion
-link:https://www.alchemists.io/projects/mac_os-config[macOS Config] project for details. The _macOS
+link:https://alchemists.io/projects/mac_os-config[macOS Config] project for details. The _macOS
 Config_ project is an opinionated configuration which meets the needs of my development environment
 but is also meant to serve as an example and guide for building your own personalized setup. Here is
 how the two projects are meant to be used:
 
 * *macOS* (this project) - The foundational framework for building custom macOS machine setups.
-* *link:https://www.alchemists.io/projects/mac_os-config[macOS Configuration]* - The layer on top of
+* *link:https://alchemists.io/projects/mac_os-config[macOS Configuration]* - The layer on top of
   this _macOS_ project which defines a custom machine implementation. The project is meant to be
   forked for as many custom machine setups as needed.
 
@@ -40,12 +40,12 @@ toc::[]
 
 == Screencast
 
-[link=https://www.alchemists.io/screencasts/mac_os]
+[link=https://alchemists.io/screencasts/mac_os]
-image::https://www.alchemists.io/images/screencasts/mac_os/cover.svg[Screencast,600,240,role=focal_point]
+image::https://alchemists.io/images/screencasts/mac_os/cover.svg[Screencast,600,240,role=focal_point]
 
 == Requirements
 
-. link:https://www.apple.com/macos/monterey[macOS Monterey]
+. link:https://www.apple.com/macos/sonoma[macOS Sonoma]
 . link:https://developer.apple.com/xcode[Xcode]
 
 == Setup
@@ -56,7 +56,7 @@ To install, run:
 ----
 git clone https://github.com/bkuhlmann/mac_os.git
 cd mac_os
-git checkout 15.0.5
+git checkout 17.0.0
 ----
 
 == Usage
@@ -172,13 +172,13 @@ All executable scripts can be found in the `bin` folder:
 * `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
+software. Everything provided via the link:https://alchemists.io/projects/mac_os-config[macOS
 Config] project is built upon the functions found in the `lib` folder. See the
-link:https://www.alchemists.io/projects/mac_os-config[macOS Config] project for further details.
+link:https://alchemists.io/projects/mac_os-config[macOS Config] project for further details.
 
 * `lib/settings.sh`: Defines global settings for software applications, extensions, etc.
 
-== Troubleshooting
+=== Troubleshooting
 
 * *Pi-hole*: When using link:https://pi-hole.net[Pi-hole], you might need to temporarily disable
   prior to upgrading as you might experience various errors with Apple not being able to detect an
@@ -216,18 +216,18 @@ git clone https://github.com/bkuhlmann/mac_os.git
 cd mac_os
 ----
 
-== link:https://www.alchemists.io/policies/license[License]
+== link:https://alchemists.io/policies/license[License]
 
-== link:https://www.alchemists.io/policies/security[Security]
+== link:https://alchemists.io/policies/security[Security]
 
-== link:https://www.alchemists.io/policies/code_of_conduct[Code of Conduct]
+== link:https://alchemists.io/policies/code_of_conduct[Code of Conduct]
 
-== link:https://www.alchemists.io/policies/contributions[Contributions]
+== link:https://alchemists.io/policies/contributions[Contributions]
 
-== link:https://www.alchemists.io/projects/mac_os/versions[Versions]
+== link:https://alchemists.io/projects/mac_os/versions[Versions]
 
-== link:https://www.alchemists.io/community[Community]
+== link:https://alchemists.io/community[Community]
 
 == Credits
 
-Engineered by link:https://www.alchemists.io/team/brooke_kuhlmann[Brooke Kuhlmann].
+Engineered by link:https://alchemists.io/team/brooke_kuhlmann[Brooke Kuhlmann].

Rakefile

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "git/lint/rake/setup"
+require "git/lint/rake/register"
 require "rubocop/rake_task"
 
+Git::Lint::Rake::Register.call
 RuboCop::RakeTask.new
 
 task default: %i[git_lint rubocop]

VERSIONS.adoc

@@ -1,5 +1,52 @@
 = Versions
 
+== 17.0.0 (2023-09-28)
+
+* Added Debug gem - Brooke Kuhlmann
+* Updated to macOS Sonoma - Brooke Kuhlmann
+
+== 16.0.4 (2023-06-19)
+
+* Updated to Caliber 0.35.0 - Brooke Kuhlmann
+* Updated to Git Lint 6.0.0 - Brooke Kuhlmann
+* Updated to Refinements 11.0.0 - Brooke Kuhlmann
+
+== 16.0.3 (2023-05-18)
+
+* Updated to Caliber 0.30.0 - Brooke Kuhlmann
+
+== 16.0.2 (2023-04-02)
+
+* Fixed programs without extensions to install to user directory - Brooke Kuhlmann
+* Updated site URLs to use bare domain - Brooke Kuhlmann
+* Updated to Ruby 3.2.1 - Brooke Kuhlmann
+* Updated to Ruby 3.2.2 - Brooke Kuhlmann
+
+== 16.0.1 (2023-02-05)
+
+* Added Rake binstub - Brooke Kuhlmann
+* Updated to Caliber 0.21.0 - Brooke Kuhlmann
+* Updated to Caliber 0.25.0 - Brooke Kuhlmann
+* Updated to Git Lint 5.0.0 - Brooke Kuhlmann
+
+== 16.0.0 (2022-12-25)
+
+* Fixed Node installer to detect Node and version - Brooke Kuhlmann
+* Fixed Ruby installer to pass configuration options - Brooke Kuhlmann
+* Updated README sections - Brooke Kuhlmann
+* Updated installs for basic, default, and shell scripts - Brooke Kuhlmann
+* Updated run script to distinquish between applications and libraries - Brooke Kuhlmann
+* Updated to Caliber 0.11.0 - Brooke Kuhlmann
+* Updated to Caliber 0.16.0 - Brooke Kuhlmann
+* Updated to Ruby 3.1.3 - Brooke Kuhlmann
+* Updated to Ruby 3.2.0 - Brooke Kuhlmann
+* Updated to macOS Ventura - Brooke Kuhlmann
+* Removed configure software script - Brooke Kuhlmann
+* Removed mention of Intel CPUs from boot disk instructions - Brooke Kuhlmann
+* Removed system update from Ruby install - Brooke Kuhlmann
+* Removed uninstallers and reinstallers - Brooke Kuhlmann
+* Refactored download file function to use multi-line curl command - Brooke Kuhlmann
+
 == 15.0.5 (2022-05-07)
 
 * Updated to Caliber 0.6.0 - Brooke Kuhlmann

bin/configure_software

@@ -1,16 +0,0 @@
-#! /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

@@ -4,19 +4,19 @@
 
 printf "macOS Boot Disk Tips\n"
 printf "  - Use a USB drive (8GB or higher).\n"
-printf "  - Use Disk Utility to format the USB drive as \"Mac OS Extended (Journaled)\".\n"
+printf "  - Use Disk Utility to format the USB drive as \"APSF\".\n"
 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 the POWER (Silicon) or OPTION (Intel) key before the Apple logo appears.\n"
+printf "  3. Press and hold the POWER 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 "  6. Use Disk Utility to create a single \"APFS\" drive.\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 the POWER (Silicon) or COMMAND+R (Intel) keys before the Apple logo appears.\n"
+printf "  2. Press and hold the POWER key 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_basics

@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
 
-# Applies basic system settings.
+# Installs basic system settings.
 
 set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
 
-SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/apply_basic_settings"
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_basics"
 
 if [[ -x "$SCRIPT_PATH" ]]; then
   "$SCRIPT_PATH"

bin/install_defaults

@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
 
-# Applies default settings.
+# Installs system and application default settings.
 
 set -o nounset
 set -o errexit
 set -o pipefail
 IFS=$'\n\t'
 
-SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/apply_default_settings"
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_defaults"
 
 if [[ -x "$SCRIPT_PATH" ]]; then
   "$SCRIPT_PATH"

bin/install_dotfiles

@@ -1,16 +0,0 @@
-#! /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_shell

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

bin/rake

@@ -0,0 +1,6 @@
+#! /usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+
+load Gem.bin_path "rake", "rake"

bin/run

@@ -4,9 +4,7 @@
 
 source lib/installers.sh
 source lib/options.sh
-source lib/reinstallers.sh
 source lib/settings.sh
-source lib/uninstallers.sh
 source lib/utilities.sh
 source lib/verifiers.sh
 
@@ -32,29 +30,25 @@ while true; do
     printf "  Boot:\n"
     printf "     B:  Create boot disk.\n"
     printf "  Install:\n"
-    printf "     b:  Apply basic settings.\n"
+    printf "     b:  Install basics.\n"
     printf "     t:  Install development tools.\n"
     printf "    hf:  Install Homebrew Formulas.\n"
     printf "    hc:  Install Homebrew Casks.\n"
     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 "     d:  Install defaults.\n"
+    printf "     s:  Install shell.\n"
+    printf "     r:  Restore backups.\n"
+    printf "     i:  Install all (i.e. executes all of the above steps in order listed).\n"
+    printf "  Libraries:\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 "     l:  Install libraries (i.e. executes all of the above steps in order listed).\n"
-    printf "    cs:  Configure installed software.\n"
-    printf "     i:  Install all (i.e. executes all of the above steps in order listed).\n"
-    printf "  Restore:\n"
-    printf "     R:  Restore settings from backup.\n"
     printf "  Manage:\n"
     printf "     c:  Check status of managed software.\n"
     printf "     C:  Caffeinate machine.\n"
-    printf "    ua:  Uninstall application software.\n"
-    printf "    ux:  Uninstall application software extension.\n"
-    printf "    ra:  Reinstall application software.\n"
-    printf "    rx:  Reinstall application software extension.\n"
     printf "     w:  Clean work (temp) directory.\n"
     printf "     q:  Quit/Exit.\n\n"
     read -p "Enter selection: " response

lib/installers.sh

@@ -11,8 +11,16 @@ download_file() {
 
   printf "%s\n" "Downloading $1..."
   clean_work_path
-  mkdir $MAC_OS_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"
+
+  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
 
@@ -193,8 +201,8 @@ export -f install_program
 # Installs Node.
 # Parameters: None.
 install_node() {
-  if ! command -v fnm > /dev/null; then
+  if [[ ! -x "$(command -v node)" ]]; then
-    $(get_homebrew_bin_root)/fnm install --lts
+    "$(get_homebrew_bin_root)/fnm" install --latest
   fi
 }
 export -f install_node
@@ -205,9 +213,11 @@ 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)/frum install "$version"
+    "$(get_homebrew_bin_root)"/frum install "$version" \
-    $(get_homebrew_bin_root)/frum local "$version"
+                                            --with-openssl-dir="$(brew --prefix openssl)" \
-    gem update --system && gem update
+                                            --enable-shared \
+                                            --disable-silent-rules
+    "$(get_homebrew_bin_root)"/frum local "$version"
   fi
 }
 export -f install_ruby

lib/options.sh

@@ -9,7 +9,7 @@ process_option() {
     'B')
       bin/create_boot_disk;;
     'b')
-      bin/apply_basic_settings;;
+      bin/install_basics;;
     't')
       bin/install_dev_tools;;
     'hf')
@@ -22,38 +22,36 @@ 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;;
+      bin/install_defaults;;
-    'cs')
+    's')
-      bin/configure_software;;
+      bin/install_shell;;
+    'r')
+      bin/restore_backup;;
     'i')
       caffeinate_machine
-      bin/apply_basic_settings
+      bin/install_basics
       bin/install_dev_tools
       bin/install_homebrew_formulas
       bin/install_homebrew_casks
       bin/install_app_store
       bin/install_applications
       bin/install_extensions
-      bin/install_dotfiles
+      bin/install_defaults
+      bin/install_shell
+      bin/restore_backup
+      clean_work_path;;
+    'np')
+      bin/install_node_packages;;
+    'rg')
+      bin/install_ruby_gems;;
+    'rc')
+      bin/install_rust_crates;;
+    'l')
       bin/install_node_packages
       bin/install_ruby_gems
-      bin/install_rust_crates
+      bin/install_rust_crates;;
-      bin/apply_default_settings
+   'c')
-      bin/configure_software
-      clean_work_path;;
-    'R')
-      caffeinate_machine
-      bin/restore_backup;;
-    'c')
       verify_homebrew_formulas
       verify_homebrew_casks
       verify_app_store_applications
@@ -64,14 +62,6 @@ process_option() {
       verify_rust_crates;;
     'C')
       caffeinate_machine;;
-    'ua')
-      uninstall_application;;
-    'ux')
-      uninstall_extension;;
-    'ra')
-      reinstall_application;;
-    'rx')
-      reinstall_extension;;
     'w')
       clean_work_path;;
     'q');;

lib/reinstallers.sh

@@ -1,17 +0,0 @@
-#! /usr/bin/env bash
-
-# Defines reinstall functions.
-
-# Reinstall application.
-reinstall_application() {
-  uninstall_application
-  bin/install_applications
-}
-export -f reinstall_application
-
-# Reinstall extension.
-reinstall_extension() {
-  uninstall_extension
-  bin/install_extensions
-}
-export -f reinstall_extension

lib/settings.sh

@@ -5,7 +5,7 @@ set -o errexit
 set -o pipefail
 IFS=$'\n\t'
 
-export MAC_OS_BOOT_DISK_CREATOR="/Applications/Install macOS Monterey.app/Contents/Resources/createinstallmedia"
+export MAC_OS_BOOT_DISK_CREATOR="/Applications/Install macOS Sonoma.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"

lib/uninstallers.sh

@@ -1,52 +0,0 @@
-#! /usr/bin/env bash
-
-# Defines uninstall functions.
-
-# Uninstalls selected application.
-uninstall_application() {
-  # Only use environment keys that end with "APP_NAME".
-  local keys=($(set | awk -F "=" '{print $1}' | grep ".*APP_NAME"))
-
-  printf "Select application to uninstall:\n"
-  for ((index = 0; index < ${#keys[*]}; index++)); do
-    local app_file="${!keys[$index]}"
-    printf "  $index: ${app_file}\n"
-  done
-  printf "  q: Quit/Exit\n\n"
-
-  read -p "Enter selection: " response
-  printf "\n"
-
-  local regex="^[0-9]+$"
-  if [[ $response =~ $regex ]]; then
-    local app_file="${!keys[$response]}"
-    local app_path=$(get_install_path "${app_file}")
-    sudo rm -rf "$app_path"
-    printf "Uninstalled: ${app_path}\n"
-  fi
-}
-export -f uninstall_application
-
-# Uninstalls selected extension.
-uninstall_extension() {
-  # Only use environment keys that end with "EXTENSION_PATH".
-  local keys=($(set | awk -F "=" '{print $1}' | grep ".*EXTENSION_PATH"))
-
-  printf "Select extension to uninstall:\n"
-  for ((index = 0; index < ${#keys[*]}; index++)); do
-    local extension_path="${!keys[$index]}"
-    printf "  $index: ${extension_path}\n"
-  done
-  printf "  q: Quit/Exit\n\n"
-
-  read -p "Enter selection: " response
-  printf "\n"
-
-  local regex="^[0-9]+$"
-  if [[ $response =~ $regex ]]; then
-    local extension_path="${!keys[$response]}"
-    rm -rf "${extension_path}"
-    printf "Uninstalled: ${extension_path}\n"
-  fi
-}
-export -f uninstall_extension

lib/utilities.sh

@@ -77,18 +77,10 @@ export -f get_install_path
 # 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.
+  case $(get_extension "$file_name") in
-  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)";;
+      printf "/usr/local/bin";;
     'app')
       printf "/Applications";;
     'prefPane')