minor changes

This commit is contained in:
Solomon Laing 2021-08-29 20:36:21 +09:30
parent 94a16aa0b3
commit 9323a47533
8 changed files with 21 additions and 54 deletions

View File

@ -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 $@
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

12
setup
View File

@ -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
}