mirror of
https://github.com/vinceliuice/grub2-themes.git
synced 2024-12-25 07:15:36 +01:00
- Reordered the $screen check function in pre-root part of install() to avoid unnecessary code execution in case the program exists early due to $screen error if ultrawide is selected with Slazy
- Minor grammatical error fixes
This commit is contained in:
parent
d005d49168
commit
f4b1a85ab0
15
install.sh
15
install.sh
@ -26,7 +26,7 @@ b_CGSC=" \033[1;32m" # bold success color
|
|||||||
b_CRER=" \033[1;31m" # bold error color
|
b_CRER=" \033[1;31m" # bold error color
|
||||||
b_CWAR=" \033[1;33m" # bold warning color
|
b_CWAR=" \033[1;33m" # bold warning color
|
||||||
|
|
||||||
# echo like ... with flag type and display message colors
|
# echo like ... with flag type and display message colors
|
||||||
prompt () {
|
prompt () {
|
||||||
case ${1} in
|
case ${1} in
|
||||||
"-s"|"--success")
|
"-s"|"--success")
|
||||||
@ -91,17 +91,17 @@ install() {
|
|||||||
local screen="1080p"
|
local screen="1080p"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ ${screen} == '1080p_21:9' && ${name} == 'Slaze' ]]; then
|
||||||
|
prompt -e "ultrawide 1080p does not support Slaze theme"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ${custom_background} == 'custom-background' ]]; then
|
if [[ ${custom_background} == 'custom-background' ]]; then
|
||||||
local custom_background="custom-background"
|
local custom_background="custom-background"
|
||||||
else
|
else
|
||||||
local custom_background="default-background"
|
local custom_background="default-background"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${screen} == '1080p_21:9' && ${name} == 'Slaze' ]]; then
|
|
||||||
prompt -e "ultrawide 1080p does not support Slaze theme"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${icon} == 'white' ]]; then
|
if [[ ${icon} == 'white' ]]; then
|
||||||
local icon="white"
|
local icon="white"
|
||||||
else
|
else
|
||||||
@ -110,6 +110,7 @@ install() {
|
|||||||
|
|
||||||
# Check for root access and proceed if it is present
|
# Check for root access and proceed if it is present
|
||||||
if [ "$UID" -eq "$ROOT_UID" ]; then
|
if [ "$UID" -eq "$ROOT_UID" ]; then
|
||||||
|
|
||||||
clear
|
clear
|
||||||
|
|
||||||
if [[ "${custom_background}" == "custom-background" ]]; then
|
if [[ "${custom_background}" == "custom-background" ]]; then
|
||||||
@ -214,7 +215,7 @@ install() {
|
|||||||
sudo -S <<< ${tui_root_login} $0 --${theme} --${icon} --${screen}
|
sudo -S <<< ${tui_root_login} $0 --${theme} --${icon} --${screen}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
read -p "[ Trusted ] Specify the root password : " -t${MAX_DELAY} -s
|
read -p " [ Trusted ] Specify the root password : " -t ${MAX_DELAY} -s
|
||||||
[[ -n "$REPLY" ]] && {
|
[[ -n "$REPLY" ]] && {
|
||||||
if [[ -n "${theme}" && -n "${screen}" ]]; then
|
if [[ -n "${theme}" && -n "${screen}" ]]; then
|
||||||
sudo -S <<< $REPLY "$0" --${theme} --${icon} --${screen}
|
sudo -S <<< $REPLY "$0" --${theme} --${icon} --${screen}
|
||||||
|
Loading…
Reference in New Issue
Block a user