diff --git a/install-config b/install-config index 4e59c9f..91f2e15 100755 --- a/install-config +++ b/install-config @@ -12,21 +12,15 @@ clear echo "This script is going to install my dotfiles." -read -r -p "Are You Sure? [y/N] " input - +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac - function config { /usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME $@ } diff --git a/install-defaults b/install-defaults index e8476e6..606562d 100755 --- a/install-defaults +++ b/install-defaults @@ -17,17 +17,14 @@ dependencies=$(sed -n '/DEFAULTS_START/,/DEFAULTS_END/p' $default_programs | sed # check user is happy to run this script echo "This script is going to install all of my default programs, e.g.: browser, rss reader, etc. As such it will ask for root privilages." echo "Defaults:$dependencies" -read -r -p "Are you sure you want to continue? [y/N] " input + +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/install-dependencies b/install-dependencies index 2637a33..7fce4e8 100755 --- a/install-dependencies +++ b/install-dependencies @@ -37,17 +37,13 @@ case $laptop_input in ;; esac -read -r -p "Are you sure you want to continue? [y/N] " input +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/install-dmenu-inkletblot b/install-dmenu-inkletblot index 62dfa17..a364409 100755 --- a/install-dmenu-inkletblot +++ b/install-dmenu-inkletblot @@ -17,18 +17,13 @@ fi echo "This script is going to install dmenu-inkletblot, my fork of dmenu with my custom styling. As such it will ask for root privilages." -read -r -p "Are You Sure? [y/N] " input - +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/install-misc b/install-misc index 620ad76..6c03630 100755 --- a/install-misc +++ b/install-misc @@ -17,17 +17,14 @@ dependencies=$(sed -n '/MISC_START/,/MISC_END/p' $default_programs | sed -e 's/M # check user is happy to run this script echo "This script is going to install all of my misc programs that I frequently use." echo "Misc programs:$dependencies" -read -r -p "Are you sure you want to continue? [y/N] " input + +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/install-scripts b/install-scripts index 3ec8617..2421dc8 100755 --- a/install-scripts +++ b/install-scripts @@ -13,17 +13,14 @@ clear # check user is happy to run this script echo "This script is going to install inks-scripts to the system, which are required for much of the supporting functionality in my dotfiles and WM. As such it will ask for root privilages." -read -r -p "Are you sure you want to continue? [y/N] " input + +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/install-yay b/install-yay index 8309c07..da6e5e4 100755 --- a/install-yay +++ b/install-yay @@ -18,18 +18,13 @@ fi echo "This script is going to attempt install yay and it's dependencies. As such it will ask for root privilages." -read -r -p "Are You Sure? [y/N] " input - +read -r -p "Are you sure you want to continue? [Y/n] " input case $input in -[yY][eE][sS] | [yY]) - echo "The program will continue..." - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + echo "The program will continue..." ;; esac diff --git a/setup b/setup index a3aab54..eb1dbfd 100755 --- a/setup +++ b/setup @@ -39,19 +39,15 @@ function install_dmenu { function update_system { # check with the user they are happy to update, exit if not though. echo "The system needs to be updated before this installation can happen. The upgrades will be applied without any user oversight which may be dangerous for out of date systems." - read -r -p "Are you sure you want to continue? [y/N] " input + read -r -p "Are you sure you want to continue? [Y/n] " input case $input in - [yY][eE][sS] | [yY]) - # Make sure everything is up to date - echo "Making sure everything is up to date..." - yay -Syyu --noconfirm - ;; [nN][oO] | [nN]) exit 0 ;; *) - echo "Invalid input..." - exit 1 + # Make sure everything is up to date + echo "Making sure everything is up to date..." + yay -Syyu --noconfirm ;; esac }