This commit is contained in:
vinceliuice 2022-12-07 22:06:48 +08:00
parent b06a7927ba
commit 9951433731
3 changed files with 27 additions and 30 deletions

View file

@ -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 ./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` Parameter: `--flatpak` `-F`
Example: `./tweaks.sh -F` Example: `./tweaks.sh -F`
@ -255,9 +255,6 @@ Usage: `./tweaks.sh [OPTIONS...]`
-F, --flatpak -F, --flatpak
Connect 'WhiteSur' theme to Flatpak. Connect 'WhiteSur' theme to Flatpak.
-s, --snap
Connect 'WhiteSur' theme the currently installed snap apps.
-d, --dash-to-dock -d, --dash-to-dock
Fixed Dash to Dock theme issue. Fixed Dash to Dock theme issue.

View file

@ -826,21 +826,21 @@ disconnect_flatpak() {
done done
} }
connect_snap() { #connect_snap() {
sudo snap install whitesur-gtk-theme # sudo snap install whitesur-gtk-theme
for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do # 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}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" # sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
done # done
} #}
disconnect_snap() { #disconnect_snap() {
for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do # 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}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" # sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
done # done
} #}
######################################################################### #########################################################################
# GTK BASE # # GTK BASE #

View file

@ -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 "-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 "-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 "-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" "" 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" prompt -e "'${1}' ERROR: There's no Flatpak installed in your system"
has_any_error="true" has_any_error="true"
fi; shift ;; fi; shift ;;
-s|--snap) # -s|--snap)
snap="true"; # snap="true";
if ! has_command snap; then # if ! has_command snap; then
prompt -e "'${1}' ERROR: There's no Snap installed in your system" # prompt -e "'${1}' ERROR: There's no Snap installed in your system"
has_any_error="true" # has_any_error="true"
fi; shift ;; # fi; shift ;;
-g|--gdm) -g|--gdm)
gdm="true"; full_sudo "${1}" gdm="true"; full_sudo "${1}"
showapps_normal="true" # use normal showapps icon showapps_normal="true" # use normal showapps icon
@ -187,11 +187,11 @@ finalize_argument_parsing
if [[ "${uninstall}" == 'true' ]]; then if [[ "${uninstall}" == 'true' ]]; then
prompt -w "REMOVAL: Non file-related parameters will be ignored. \n" prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
if [[ "${snap}" == 'true' ]]; then # if [[ "${snap}" == 'true' ]]; then
prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n" # prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n"
disconnect_snap # disconnect_snap
prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo # prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo
fi # fi
if [[ "${flatpak}" == 'true' ]]; then if [[ "${flatpak}" == 'true' ]]; then
prompt -i "Disconnecting '${name}' theme from your Flatpak... \n" prompt -i "Disconnecting '${name}' theme from your Flatpak... \n"
@ -263,7 +263,7 @@ else
fi fi
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 -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: Don't forget to define which component to tweak, e.g. '--gdm'"
prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo