Merge pull request #281 from rivanfebrian123/master

Add support for Firefox theme for Snap, and add more debuging info
This commit is contained in:
Vince
2021-05-31 21:17:53 +08:00
committed by GitHub
3 changed files with 35 additions and 15 deletions

View File

@@ -433,9 +433,9 @@ revert_gdm_theme() {
###############################################################################
install_firefox_theme() {
#TODO: add support for Snap
if has_flatpak_app org.mozilla.firefox; then
if has_snap_app firefox; then
local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
elif has_flatpak_app org.mozilla.firefox; then
local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
else
local TARGET_DIR="${FIREFOX_THEME_DIR}"
@@ -448,7 +448,10 @@ install_firefox_theme() {
}
config_firefox() {
if has_flatpak_app org.mozilla.firefox; then
if has_snap_app firefox; then
local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
local FIREFOX_DIR="${FIREFOX_SNAP_DIR_HOME}"
elif has_flatpak_app org.mozilla.firefox; then
local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
local FIREFOX_DIR="${FIREFOX_FLATPAK_DIR_HOME}"
else
@@ -473,7 +476,9 @@ config_firefox() {
}
edit_firefox_theme_prefs() {
if has_flatpak_app org.mozilla.firefox; then
if has_snap_app firefox; then
local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
elif has_flatpak_app org.mozilla.firefox; then
local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
else
local TARGET_DIR="${FIREFOX_THEME_DIR}"
@@ -489,6 +494,9 @@ remove_firefox_theme() {
rm -rf "${FIREFOX_THEME_DIR}"
rm -rf "${FIREFOX_FLATPAK_DIR_HOME}/"*"default"*"/chrome"
rm -rf "${FIREFOX_FLATPAK_THEME_DIR}"
# Again, this too
rm -rf "${FIREFOX_SNAP_DIR_HOME}/"*"default"*"/chrome"
rm -rf "${FIREFOX_SNAP_THEME_DIR}"
}
###############################################################################