From 1209168a947fde90403ba79d2a2a818ed57705b5 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 30 May 2021 19:55:49 +0800
Subject: [PATCH] Fixed #273

---
 lib-install.sh | 7 ++++---
 tweaks.sh      | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib-install.sh b/lib-install.sh
index 13f20b5..ee969d1 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -434,7 +434,8 @@ revert_gdm_theme() {
 
 install_firefox_theme() {
   remove_firefox_theme
-  userify cp -rf "${FIREFOX_SRC_DIR}"                                                           "${FIREFOX_THEME_DIR}"
+  [[ ! -d "${FIREFOX_THEME_DIR}" ]] && mkdir -p ${FIREFOX_THEME_DIR}
+  userify cp -rf "${FIREFOX_SRC_DIR}"/*                                                         "${FIREFOX_THEME_DIR}"
   config_firefox
 }
 
@@ -462,8 +463,8 @@ edit_firefox_theme_prefs() {
 }
 
 remove_firefox_theme() {
-  rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_THEME_DIR}"
+  # rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
+  rm -rf "${FIREFOX_THEME_DIR}/WhiteSur"
 }
 
 ###############################################################################
diff --git a/tweaks.sh b/tweaks.sh
index cc70701..056e578 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -68,9 +68,9 @@ while [[ $# -gt 0 ]]; do
       esac
 
       if [[ -d "${FIREFOX_FLATPAK_DIR_HOME}" ]]; then
-          FIREFOX_DIR_HOME=${FIREFOX_FLATPAK_DIR_HOME}
-	  mkdir -p ${FIREFOX_FLATPAK_THEME_DIR}
-	  FIREFOX_THEME_DIR=${FIREFOX_FLATPAK_THEME_DIR}
+        FIREFOX_DIR_HOME=${FIREFOX_FLATPAK_DIR_HOME}
+        [[ ! -d "${FIREFOX_FLATPAK_THEME_DIR}" ]] && mkdir -p ${FIREFOX_FLATPAK_THEME_DIR}
+        FIREFOX_THEME_DIR=${FIREFOX_FLATPAK_THEME_DIR}
       fi;
 
       if [[ ! -d "${FIREFOX_FLATPAK_DIR_HOME}" ]] && ! has_command firefox; then