diff --git a/bin/apply_basic_settings b/bin/install_basics similarity index 70% rename from bin/apply_basic_settings rename to bin/install_basics index ecf63ff..f121741 100755 --- a/bin/apply_basic_settings +++ b/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" diff --git a/bin/apply_default_settings b/bin/install_defaults similarity index 67% rename from bin/apply_default_settings rename to bin/install_defaults index e7f1846..9e27f97 100755 --- a/bin/apply_default_settings +++ b/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" diff --git a/bin/install_dotfiles b/bin/install_dotfiles deleted file mode 100755 index 54eb732..0000000 --- a/bin/install_dotfiles +++ /dev/null @@ -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 diff --git a/bin/install_shell b/bin/install_shell new file mode 100755 index 0000000..df7b206 --- /dev/null +++ b/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 diff --git a/bin/run b/bin/run index ebc8ee5..d21900a 100755 --- a/bin/run +++ b/bin/run @@ -30,7 +30,7 @@ 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" @@ -41,7 +41,7 @@ while true; do 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 " 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" diff --git a/lib/options.sh b/lib/options.sh index d26112e..1bde4c4 100644 --- a/lib/options.sh +++ b/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') @@ -31,10 +31,10 @@ process_option() { 'rc') bin/install_rust_crates;; 'd') - bin/apply_default_settings;; + bin/install_defaults;; 'i') caffeinate_machine - bin/apply_basic_settings + bin/install_basics bin/install_dev_tools bin/install_homebrew_formulas bin/install_homebrew_casks @@ -45,7 +45,7 @@ process_option() { bin/install_node_packages bin/install_ruby_gems bin/install_rust_crates - bin/apply_default_settings + bin/install_defaults clean_work_path;; 'R') caffeinate_machine