diff --git a/install.sh b/install.sh index 5a5701ee..f8e5a433 100755 --- a/install.sh +++ b/install.sh @@ -184,6 +184,10 @@ else prompt -i "Start icon style : ${icon}" prompt -i "Nautilus style : ${nautilus_style}" + if has_command gnome-shell; then + prompt -i "Desktop : $(gnome-shell --version)" + fi + if [[ "${libadwaita}" == 'true' ]]; then if [[ "$UID" != '0' ]]; then install_libadwaita diff --git a/libs/lib-core.sh b/libs/lib-core.sh index a7db5f95..0e1d2347 100755 --- a/libs/lib-core.sh +++ b/libs/lib-core.sh @@ -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 diff --git a/libs/lib-install.sh b/libs/lib-install.sh index 6704732c..e4a2e1de 100755 --- a/libs/lib-install.sh +++ b/libs/lib-install.sh @@ -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 } diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss index d67ae8b3..f6920db3 100644 --- a/src/sass/gtk/apps/_gnome-40.0.scss +++ b/src/sass/gtk/apps/_gnome-40.0.scss @@ -188,7 +188,8 @@ $flap_sidebar_size: 240px; } .dim-label { - border-spacing: 0; + color: $fg_color; + margin: $base_padding / 2 $base_padding / 2 0 0; } } }