Merge branch 'master' of https://github.com/vinceliuice/WhiteSur-gtk-theme

install.sh

@@ -107,7 +107,7 @@ if [[ "${uninstall}" == 'true' ]]; then
   remove_themes
   prompt -s "Done! All '${name}' themes has been removed."
 else
-  install_theme_deps
+  install_theme_deps; echo
 
   if [[ "${interactive}" == 'true' ]]; then
     show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
@@ -126,13 +126,19 @@ else
   prompt -i "Alt variants     : $( IFS=';'; echo "${alts[*]}" )"
   prompt -i "Icon variant     : ${icon}"
   prompt -i "Nautilus variant : ${nautilus_style}"
-  echo; install_themes
 
-  # if [[ "$(which xfce4-session 2> /dev/null)" ]]; then
-  #   msg="XFCE: you may need to logout after changing your theme to fix your panel opacity."
-  # fi
+  echo; install_themes; echo; prompt -s "Done!"
 
-  echo; prompt -s "Done!"; echo; prompt -w "${msg}"; echo
+  if [[ "${DISTRO_BASE}" == "arch" && "$(which xfce4-session 2> /dev/null)" ]]; then
+    msg="XFCE: you may need to logout after changing your theme to fix your panel opacity."
+    notif_msg="${msg}\n\n${final_msg}"
 
-  [[ -x /usr/bin/notify-send ]] && notify-send "'${name}' theme has been installed. Enjoy!" "${msg}" -i "dialog-information-symbolic"
+    echo; prompt -w "${msg}"
+  else
+    notif_msg="${final_msg}"
+  fi
+
+  echo; prompt -w "${final_msg}"; echo
+
+  [[ -x /usr/bin/notify-send ]] && notify-send "'${name}' theme has been installed. Enjoy!" "${notif_msg}" -i "dialog-information-symbolic"
 fi

lib-core.sh

@@ -18,6 +18,7 @@ else LIB_CORE_IMPORTED="true"; fi
 
 export WHITESUR_PID=$$
 MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})"
+DISTRO_BASE="$(cat '/etc/os-release' | awk -F '=' '/ID_LIKE/{print $2}')"
 
 if command -v gnome-shell &> /dev/null; then
   if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then
@@ -122,7 +123,9 @@ max_round="false"
 showapps_normal="false"
 
 # Misc
-msg="Run '${0} --help' to explore more customization features!"
+msg=""
+final_msg="Run '${0} --help' to explore more customization features!"
+notif_msg=""
 error_msg=""
 process_ids=()
 ANIM_PID="0"
@@ -489,8 +492,8 @@ userify() {
 }
 
 sig_c() {
-  kill -13 "${process_ids[@]}" &> /dev/null
-  stop_animation; wait "${process_ids[@]}"; operation_canceled
+  kill -13 ${process_ids[*]} &> /dev/null
+  stop_animation; wait ${process_ids[*]} &> /dev/null; operation_canceled
 }
 
 operation_canceled() {

lib-install.sh

@@ -137,7 +137,7 @@ install_darky() {
 install_xfwmy() {
   local color="$(destify ${1})"
 
-  local TARGET_DIR="${dest}/${name}${color}-mdpi"
+  local TARGET_DIR="${dest}/${name}${color}"
   local HDPI_TARGET_DIR="${dest}/${name}${color}-hdpi"
   local XHDPI_TARGET_DIR="${dest}/${name}${color}-xhdpi"
 
@@ -349,7 +349,7 @@ install_themes() {
     done
   done
 
-  wait "${process_ids[@]}"
+  wait ${process_ids[*]} &> /dev/null
   stop_animation
 }
 
@@ -367,7 +367,7 @@ remove_themes() {
     done
   done
 
-  wait "${process_ids[@]}"
+  wait ${process_ids[*]} &> /dev/null
 }
 
 install_gdm_theme() {