From 7dc77ce37df1bae9ab39174b423117aa4452b7b6 Mon Sep 17 00:00:00 2001 From: ciricode Date: Sun, 15 Aug 2021 10:35:20 +0700 Subject: [PATCH] Revert --- install.sh | 2 +- lib-core.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d50b734..efbedc0 100755 --- a/install.sh +++ b/install.sh @@ -152,7 +152,7 @@ else if (is_running "xfce4-session"); then msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity." - elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "new" ]]; then + elif (is_my_distro "solus") && (is_running "gnome-session"); then msg="GNOME: you may need to disable 'User Themes' extension to fix your dock." elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "old" ]]; then msg="GNOME: you may need to disable 'User Themes' extension to fix your logout and authentication dialog." diff --git a/lib-core.sh b/lib-core.sh index 67f11ff..3ab08aa 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -171,6 +171,10 @@ has_snap_app() { snap list "${1}" &> /dev/null || return 1 } +is_my_distro() { + [[ "$(cat '/etc/os-release' | awk -F '=' '/ID/{print $2}')" =~ "${1}" ]] +} + is_running() { pgrep "$1" &> /dev/null }