From f640e370894e978c85048f3ae410781ae41b23d6 Mon Sep 17 00:00:00 2001 From: Brooke Kuhlmann Date: Mon, 15 Mar 2021 21:51:50 -0600 Subject: [PATCH] Updated setup software as configure software script Necessary to better describe the purpose of this script. --- bin/configure_software | 16 ++++++++++++++++ bin/run | 2 +- bin/setup_software | 16 ---------------- lib/options.sh | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100755 bin/configure_software delete mode 100755 bin/setup_software diff --git a/bin/configure_software b/bin/configure_software new file mode 100755 index 0000000..c55a9df --- /dev/null +++ b/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 diff --git a/bin/run b/bin/run index 5bef68a..5739356 100755 --- a/bin/run +++ b/bin/run @@ -44,7 +44,7 @@ while true; do 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 in order listed).\n" printf " Restore:\n" printf " R: Restore settings from backup.\n" diff --git a/bin/setup_software b/bin/setup_software deleted file mode 100755 index 55b55d6..0000000 --- a/bin/setup_software +++ /dev/null @@ -1,16 +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 diff --git a/lib/options.sh b/lib/options.sh index c390064..a6eefd1 100644 --- a/lib/options.sh +++ b/lib/options.sh @@ -32,8 +32,8 @@ process_option() { bin/install_rust_crates;; 'd') bin/apply_default_settings;; - 's') - bin/setup_software;; + 'cs') + bin/configure_software;; 'i') caffeinate_machine bin/apply_basic_settings @@ -48,7 +48,7 @@ process_option() { bin/install_ruby_gems bin/install_rust_crates bin/apply_default_settings - bin/setup_software + bin/configure_software clean_work_path;; 'R') caffeinate_machine