Update install.sh
This commit is contained in:
parent
a4bff7bf91
commit
f4f3354233
1 changed files with 33 additions and 32 deletions
|
@ -103,7 +103,6 @@ generate() {
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/assets/assets-select/select-${screen}/"*.png "${THEME_DIR}/${theme}"
|
cp -a --no-preserve=ownership "${REO_DIR}/assets/assets-select/select-${screen}/"*.png "${THEME_DIR}/${theme}"
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/assets/info-${screen}.png" "${THEME_DIR}/${theme}/info.png"
|
cp -a --no-preserve=ownership "${REO_DIR}/assets/info-${screen}.png" "${THEME_DIR}/${theme}/info.png"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install() {
|
install() {
|
||||||
|
@ -198,7 +197,7 @@ install() {
|
||||||
prompt -w "\n * At the next restart of your computer you will see your new Grub theme: '$theme' "
|
prompt -w "\n * At the next restart of your computer you will see your new Grub theme: '$theme' "
|
||||||
|
|
||||||
#Check if password is cached (if cache timestamp has not expired yet)
|
#Check if password is cached (if cache timestamp has not expired yet)
|
||||||
elif sudo -n true 2> /dev/null && echo; then #No need for "$?" ==> https://github.com/koalaman/shellcheck/wiki/SC2181
|
elif sudo -n true 2> /dev/null && echo; then
|
||||||
sudo "$0" -t ${theme} -i ${icon} -s ${screen}
|
sudo "$0" -t ${theme} -i ${icon} -s ${screen}
|
||||||
else
|
else
|
||||||
|
|
||||||
|
@ -446,6 +445,7 @@ dialog_installer() {
|
||||||
fi
|
fi
|
||||||
run_dialog
|
run_dialog
|
||||||
install "${theme}" "${icon}" "${screen}"
|
install "${theme}" "${icon}" "${screen}"
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
#######################################################
|
#######################################################
|
||||||
|
@ -453,6 +453,7 @@ dialog_installer() {
|
||||||
#######################################################
|
#######################################################
|
||||||
|
|
||||||
install=install
|
install=install
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
PROG_ARGS+=("${1}")
|
PROG_ARGS+=("${1}")
|
||||||
dialog='false'
|
dialog='false'
|
||||||
|
@ -491,7 +492,7 @@ while [[ $# -gt 0 ]]; do
|
||||||
themes+=("${THEME_VARIANTS[3]}")
|
themes+=("${THEME_VARIANTS[3]}")
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-*) # "-*" overrides "--*"
|
-*)
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
Loading…
Reference in a new issue