github/WhiteSur-gtk-theme
4
0
Fork 0
mirror of https://github.com/vinceliuice/WhiteSur-gtk-theme.git synced 2026-07-06 23:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1370

Browse Source
This commit is contained in:
vinceliuice
2025-11-09 15:17:04 +08:00
parent 5241ce94fd
commit 95584787e9
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/lib-core.sh
View File

@@ -24,7 +24,12 @@ export WHITESUR_PID=$$
MY_USERNAME="${SUDO_USER:-$(logname 2> /dev/null || echo "${USER}")}"
MY_HOME=$(getent passwd "${MY_USERNAME}" | cut -d: -f6)
if command -v gnome-shell &> /dev/null; then
# Check command availability
has_command() {
command -v "$1" &> /dev/null
}
if has_command gnome-shell; then
SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
if [[ "${SHELL_VERSION:-}" -ge "48" ]]; then
GNOME_VERSION="48-0"
@@ -185,11 +190,6 @@ anim=(
" ${c_blue}•${c_green}•${c_red}•${c_magenta}•"
)
# Check command availability
has_command() {
command -v "$1" &> /dev/null
}
has_flatpak_app() {
flatpak list --columns=application | grep "${1}" &> /dev/null || return 1
}
@@ -332,11 +332,13 @@ signal_error() {
prompt -e "\n =========== SYSTEM INFO ========="
prompt -e "DISTRO : $(IFS=';'; echo "${dist_ids[*]}")"
prompt -e "SUDO : $([[ -w "/root" ]] && echo "yes" || echo "no")"
if command -v gnome-shell &> /dev/null; then
if has_command gnome-shell; then
prompt -e "DESKTOP : $(gnome-shell --version)"
else
prompt -e "DESKTOP : ${DESKTOP_SESSION}"
fi
prompt -e "REPO : ${repo_ver}\n"
if [[ "$(grep -ril "Release" "${WHITESUR_TMP_DIR}/error_log.txt")" == "${WHITESUR_TMP_DIR}/error_log.txt" ]]; then

4
libs/lib-install.sh
View File

@@ -574,11 +574,11 @@ remove_libadwaita() {
###############################################################################
fix_whiskermenu() {
if (command -v xfce4-popup-whiskermenu &> /dev/null) && $(sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc" &> /dev/null); then
if has_command xfce4-popup-whiskermenu && $(sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc" &> /dev/null); then
sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc"
fi
if pgrep xfce4-session &> /dev/null && [ "$(id -u)" -ne 0 ]; then
if pgrep xfce4-session &> /dev/null && [ "$(id -u)" -ne 0 ] && has_command xfce4-popup-whiskermenu; then
xfce4-panel -r
fi
}