diff --git a/bin/run b/bin/run index 9fa38e6..590e7ee 100755 --- a/bin/run +++ b/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 @@ -51,10 +49,6 @@ while true; do 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 diff --git a/lib/options.sh b/lib/options.sh index a6eefd1..b574085 100644 --- a/lib/options.sh +++ b/lib/options.sh @@ -64,14 +64,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');; diff --git a/lib/reinstallers.sh b/lib/reinstallers.sh deleted file mode 100644 index 6734695..0000000 --- a/lib/reinstallers.sh +++ /dev/null @@ -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 diff --git a/lib/uninstallers.sh b/lib/uninstallers.sh deleted file mode 100644 index 9415ea8..0000000 --- a/lib/uninstallers.sh +++ /dev/null @@ -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