From 4159fbce7140b15e1d9d0172f0d861feb9e575c9 Mon Sep 17 00:00:00 2001
From: Brooke Kuhlmann <brooke@alchemists.io>
Date: Sat, 24 Dec 2022 07:35:00 -0700
Subject: [PATCH] Updated run script to distinquish between applications and
 libraries

Necessary to improve the install reliability of software and
associated libraries (extensions). There is now a split between core
installation of applications and associated libraries. This is a loose
split since everything in the *Install* category is mostly
applications but also contains related setup while the *Libraries*
category requires a machine reboot so the fully configured environment
is loaded to ensure all libraries install properly.

The specifics of these changes will be handled in the corresponding
macOS Configuration project.
---
 bin/run        | 11 ++++++-----
 lib/options.sh | 33 +++++++++++++++++----------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/bin/run b/bin/run
index d21900a..0b070b4 100755
--- a/bin/run
+++ b/bin/run
@@ -37,14 +37,15 @@ 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 "     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:  Install defaults.\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 "     l:  Install libraries (i.e. executes all of the above steps in order listed).\n"
     printf "  Manage:\n"
     printf "     c:  Check status of managed software.\n"
     printf "     C:  Caffeinate machine.\n"
diff --git a/lib/options.sh b/lib/options.sh
index 1bde4c4..1223e29 100644
--- a/lib/options.sh
+++ b/lib/options.sh
@@ -22,16 +22,12 @@ 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/install_defaults;;
+    's')
+      bin/install_shell;;
+    'r')
+      bin/restore_backup;;
     'i')
       caffeinate_machine
       bin/install_basics
@@ -41,16 +37,21 @@ process_option() {
       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_defaults
-      clean_work_path;;
-    'R')
-      caffeinate_machine
-      bin/restore_backup;;
-    'c')
+      bin/install_rust_crates;;
+   'c')
       verify_homebrew_formulas
       verify_homebrew_casks
       verify_app_store_applications