Merge pull request #90 from Dragon8oy/custom-background

Added --custom-background, to use a custom background
This commit is contained in:
Vince 2020-10-17 19:32:34 +08:00 committed by GitHub
commit f9d4b08dfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -58,6 +58,7 @@ usage() {
printf " %-25s%s\n" "-v, --vimix" "vimix grub theme" printf " %-25s%s\n" "-v, --vimix" "vimix grub theme"
printf " %-25s%s\n" "-w, --white" "Install white icon version" printf " %-25s%s\n" "-w, --white" "Install white icon version"
printf " %-25s%s\n" "-u, --ultrawide" "Install 2560x1080 background image - not available for slaze grub theme" printf " %-25s%s\n" "-u, --ultrawide" "Install 2560x1080 background image - not available for slaze grub theme"
printf " %-25s%s\n" "-C, --custom-background" "Use either background.jpg or custom-background.jpg as theme background instead"
printf " %-25s%s\n" "-2, --2k" "Install 2k(2560x1440) background image" printf " %-25s%s\n" "-2, --2k" "Install 2k(2560x1440) background image"
printf " %-25s%s\n" "-4, --4k" "Install 4k(3840x2160) background image" printf " %-25s%s\n" "-4, --4k" "Install 4k(3840x2160) background image"
printf " %-25s%s\n" "-r, --remove" "Remove theme (must add theme name option)" printf " %-25s%s\n" "-r, --remove" "Remove theme (must add theme name option)"
@ -90,6 +91,12 @@ install() {
local screen="1080p" local screen="1080p"
fi fi
if [[ ${custom_background} == 'custom-background' ]]; then
local custom_background="custom-background"
else
local custom_background="default-background"
fi
if [[ ${screen} == '1080p_21:9' && ${name} == 'Slaze' ]]; then if [[ ${screen} == '1080p_21:9' && ${name} == 'Slaze' ]]; then
prompt -e "ultrawide 1080p does not support Slaze theme" prompt -e "ultrawide 1080p does not support Slaze theme"
exit 1 exit 1
@ -105,6 +112,17 @@ install() {
if [ "$UID" -eq "$ROOT_UID" ]; then if [ "$UID" -eq "$ROOT_UID" ]; then
clear clear
if [[ "${custom_background}" == "custom-background" ]]; then
if [[ -f "background.jpg" ]]; then
custom_background="background.jpg"
elif [[ -f "custom-background.jpg" ]]; then
custom_background="custom-background.jpg"
else
prompt -e "Neither background.jpg, or custom-background.jpg could be found, exiting"
exit 0
fi
fi
# Create themes directory if not exists # Create themes directory if not exists
echo -e "\n Checking for the existence of themes directory..." echo -e "\n Checking for the existence of themes directory..."
@ -116,6 +134,16 @@ install() {
cp -a "${REO_DIR}/common/"{*.png,*.pf2} "${THEME_DIR}/${name}" cp -a "${REO_DIR}/common/"{*.png,*.pf2} "${THEME_DIR}/${name}"
cp -a "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${name}/theme.txt" cp -a "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${name}/theme.txt"
if [[ ${custom_background} == "background.jpg" ]] || [[ ${custom_background} == "custom-background.jpg" ]]; then
if [[ -f "$custom_background" ]]; then
prompt -i "\n Using ${custom_background} as background image..."
cp -a "${REO_DIR}/${custom_background}" "${THEME_DIR}/${name}/background.jpg"
else
prompt -e "$custom_background couldn't be found, exiting"
exit 0
fi
else
cp -a "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg" cp -a "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg"
if [[ ${screen} == '1080p_21:9' ]]; then if [[ ${screen} == '1080p_21:9' ]]; then
cp -a "${REO_DIR}/assets/assets-${icon}/icons-1080p" "${THEME_DIR}/${name}/icons" cp -a "${REO_DIR}/assets/assets-${icon}/icons-1080p" "${THEME_DIR}/${name}/icons"
@ -124,6 +152,7 @@ install() {
cp -a "${REO_DIR}/assets/assets-${icon}/icons-${screen}" "${THEME_DIR}/${name}/icons" cp -a "${REO_DIR}/assets/assets-${icon}/icons-${screen}" "${THEME_DIR}/${name}/icons"
cp -a "${REO_DIR}/assets/assets-${icon}/select-${screen}/"*.png "${THEME_DIR}/${name}" cp -a "${REO_DIR}/assets/assets-${icon}/select-${screen}/"*.png "${THEME_DIR}/${name}"
fi fi
fi
# Set theme # Set theme
prompt -i "\n Setting ${name} as default..." prompt -i "\n Setting ${name} as default..."
@ -159,13 +188,13 @@ install() {
# persisted execution of the script as root # persisted execution of the script as root
if [[ -n ${tui_root_login} ]] ; then if [[ -n ${tui_root_login} ]] ; then
if [[ -n "${theme}" && -n "${screen}" ]]; then if [[ -n "${theme}" && -n "${screen}" ]]; then
sudo -S <<< ${tui_root_login} $0 --${theme} --${icon} --${screen} sudo -S <<< ${tui_root_login} $0 --${theme} --${icon} --${screen} --${custom_background}
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} --${custom_background}
fi fi
} || { } || {
operation_canceled operation_canceled
@ -373,6 +402,12 @@ while [[ $# -ge 1 ]]; do
-u|--ultrawide|--1080p_21:9) -u|--ultrawide|--1080p_21:9)
screen='1080p_21:9' screen='1080p_21:9'
;; ;;
-C|--custom-background|--custom)
custom_background='custom-background'
;;
-D|--default-background)
custom_background='default-background'
;;
-r|--remove) -r|--remove)
remove='true' remove='true'
;; ;;