From 821968835420f3e80d784f5da665ecd08825fae5 Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Fri, 16 Oct 2020 21:50:12 +0100
Subject: [PATCH 1/2] Added --custom-background, to use custom-background.jpg
 or background.jpg as a custom background

---
 install.sh | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index 2b0df8e..4e0cee7 100755
--- a/install.sh
+++ b/install.sh
@@ -90,6 +90,12 @@ install() {
     local screen="1080p"
   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
     prompt -e "ultrawide 1080p does not support Slaze theme"
     exit 1
@@ -105,6 +111,17 @@ install() {
   if [ "$UID" -eq "$ROOT_UID" ]; then
     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
     echo -e "\n Checking for the existence of themes directory..."
 
@@ -116,13 +133,24 @@ install() {
 
     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}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg"
-    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}/select-1080p/"*.png "${THEME_DIR}/${name}"
+
+    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}/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}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg"
+      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}/select-1080p/"*.png "${THEME_DIR}/${name}"
+      else
+        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}"
+      fi
     fi
 
     # Set theme
@@ -159,13 +187,13 @@ install() {
     # persisted execution of the script as root
     if [[ -n ${tui_root_login} ]] ; 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
     else
         read -p "[ Trusted ] Specify the root password : " -t${MAX_DELAY} -s
         [[ -n "$REPLY" ]] && {
         if [[ -n "${theme}" && -n "${screen}" ]]; then
-            sudo -S <<< $REPLY $0 --${theme} --${icon} --${screen}
+            sudo -S <<< $REPLY $0 --${theme} --${icon} --${screen} --${custom_background}
         fi
         } || {
              operation_canceled
@@ -373,6 +401,12 @@ while [[ $# -ge 1 ]]; do
     -u|--ultrawide|--1080p_21:9)
       screen='1080p_21:9'
       ;;
+    -C|--custom-background|--custom)
+      custom_background='custom-background'
+      ;;
+    -D|--default-background)
+      custom_background='default-background'
+      ;;
     -r|--remove)
       remove='true'
       ;;

From 93c08b23b1024ddac001a10adb4b80a168f2756d Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Fri, 16 Oct 2020 21:58:06 +0100
Subject: [PATCH 2/2] Added --custom-background usage to --help

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index 4e0cee7..9c6dcfd 100755
--- a/install.sh
+++ b/install.sh
@@ -58,6 +58,7 @@ usage() {
   printf "  %-25s%s\n" "-v, --vimix" "vimix grub theme"
   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" "-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" "-4, --4k" "Install 4k(3840x2160) background image"
   printf "  %-25s%s\n" "-r, --remove" "Remove theme (must add theme name option)"