From 99514337311b6ea1e4eb912870bc13bf31a061fd Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Wed, 7 Dec 2022 22:06:48 +0800
Subject: [PATCH] update

---
 README.md            |  5 +----
 shell/lib-install.sh | 26 +++++++++++++-------------
 tweaks.sh            | 26 +++++++++++++-------------
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index ca2c6a0..bd5b8d3 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Run this command to install `WhiteSur` into `gtk-4.0 configuration folder` ($HOM
 ./install.sh -l -c Light       # install light theme for libadwaita
 ```
 
-### Connect WhiteSur theme to Flatpak
+### Connect WhiteSur theme to Flatpak (Snap not support)
 Parameter: `--flatpak` `-F`
 
 Example: `./tweaks.sh -F`
@@ -255,9 +255,6 @@ Usage:  `./tweaks.sh [OPTIONS...]`
   -F, --flatpak
  Connect 'WhiteSur' theme to Flatpak.
 
-  -s, --snap
- Connect 'WhiteSur' theme the currently installed snap apps.
-
   -d, --dash-to-dock
  Fixed Dash to Dock theme issue.
 
diff --git a/shell/lib-install.sh b/shell/lib-install.sh
index 6f7fc6a..491b211 100755
--- a/shell/lib-install.sh
+++ b/shell/lib-install.sh
@@ -826,21 +826,21 @@ disconnect_flatpak() {
   done
 }
 
-connect_snap() {
-  sudo snap install whitesur-gtk-theme
+#connect_snap() {
+#  sudo snap install whitesur-gtk-theme
 
-  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
-    sudo snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
-    sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
-  done
-}
+#  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
+#    sudo snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
+#    sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
+#  done
+#}
 
-disconnect_snap() {
-  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
-    sudo snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
-    sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
-  done
-}
+#disconnect_snap() {
+#  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
+#    sudo snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
+#    sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
+#  done
+#}
 
 #########################################################################
 #                               GTK BASE                                #
diff --git a/tweaks.sh b/tweaks.sh
index dc28887..ac8b21b 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -39,7 +39,7 @@ usage() {
   helpify "-e, --edit-firefox"  ""                                                  "Edit '${THEME_NAME}' theme for Firefox settings and also connect the theme to the current Firefox profiles" ""
 
   helpify "-F, --flatpak"       ""                                                  "Connect '${THEME_NAME}' theme to Flatpak"                                    ""
-  helpify "-s, --snap"          ""                                                  "Connect '${THEME_NAME}' theme the currently installed snap apps"             ""
+  #helpify "-s, --snap"          ""                                                  "Connect '${THEME_NAME}' theme the currently installed snap apps"             ""
   helpify "-d, --dash-to-dock"  ""                                                  "Fixed Dash to Dock theme issue"                                              ""
 
   helpify "-r, --remove, --revert" ""                                               "Revert to the original themes, do the opposite things of install and connect" ""
@@ -118,13 +118,13 @@ while [[ $# -gt 0 ]]; do
         prompt -e "'${1}' ERROR: There's no Flatpak installed in your system"
         has_any_error="true"
       fi; shift ;;
-    -s|--snap)
-      snap="true";
+#    -s|--snap)
+#      snap="true";
 
-      if ! has_command snap; then
-        prompt -e "'${1}' ERROR: There's no Snap installed in your system"
-        has_any_error="true"
-      fi; shift ;;
+#      if ! has_command snap; then
+#        prompt -e "'${1}' ERROR: There's no Snap installed in your system"
+#        has_any_error="true"
+#      fi; shift ;;
     -g|--gdm)
       gdm="true"; full_sudo "${1}"
       showapps_normal="true" # use normal showapps icon
@@ -187,11 +187,11 @@ finalize_argument_parsing
 if [[ "${uninstall}" == 'true' ]]; then
   prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
 
-  if [[ "${snap}" == 'true' ]]; then
-    prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n"
-    disconnect_snap
-    prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo
-  fi
+#  if [[ "${snap}" == 'true' ]]; then
+#    prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n"
+#    disconnect_snap
+#    prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo
+#  fi
 
   if [[ "${flatpak}" == 'true' ]]; then
     prompt -i "Disconnecting '${name}' theme from your Flatpak... \n"
@@ -263,7 +263,7 @@ else
   fi
 fi
 
-if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${snap}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" && "${libadwaita}" == "false" ]]; then
+if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" && "${libadwaita}" == "false" ]]; then
   prompt -e "Oops... there's nothing to tweak..."
   prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'"
   prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo