updated code to whitesur 121221 9a8a306

install.sh

@@ -41,6 +41,7 @@ usage() {
   helpify "--round, --roundedmaxwindow"   ""                                          "Set maximized window to rounded"                  "Default is square"
   helpify "--right, --rightplacement"     ""                                          "Set Nautilus titlebutton placement to right"      "Default is left"
   helpify "--black, --blackfont"          ""                                          "Set panel font color to black"                    "Default is white"
+  helpify "--darker, --darkercolor"       ""                                          "Install darker '${THEME_NAME}' dark themes"       ""
   helpify "--dialog, --interactive"       ""                                          "Run this installer interactively, with dialogs"   ""
   helpify "--silent-mode"                 ""                                          "Meant for developers: ignore any confirm prompt and params become more strict" ""
   helpify "-r, --remove, -u, --uninstall" ""                                          "Remove all installed ${THEME_NAME} themes"        ""
@@ -66,7 +67,7 @@ while [[ $# -gt 0 ]]; do
   # at once
 
   case "${1}" in
-      # Parameters that don't require value
+    # Parameters that don't require value
     -r|--remove|-u|-uninstall)
       uninstall='true'; shift ;;
     --silent-mode)
@@ -81,11 +82,13 @@ while [[ $# -gt 0 ]]; do
       max_round="true"; shift ;;
     --black|--blackfont)
       black_font="true"; shift ;;
+    --darker|--darkercolor)
+      darker="true"; shift ;;
     -HD|--highdefinition)
       compact="false"; shift ;;
     -m|--monterey)
       monterey="true"; shift ;;
-      # Parameters that require value, single use
+    # Parameters that require value, single use
     -b|--background)
       check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
     -d|--dest)
@@ -124,10 +127,14 @@ finalize_argument_parsing
 #---------------------------START INSTALL THEMES-------------------------------#
 
 if [[ "${uninstall}" == 'true' ]]; then
-  prompt -i "Removing '${name}' themes in '${dest}'..."
-  prompt -w "REMOVAL: Non file-related parameters will be ignored."; echo
+  prompt -i "Removing '${name}' gtk themes in '${dest}'... \n"
+  prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
   remove_themes
-  prompt -s "Done! All '${name}' themes has been removed."
+  prompt -s "Done! All '${name}' gtk themes in has been removed. \n"
+
+  if [[ -f "${MISC_GR_FILE}.bak" ]]; then
+    prompt -e "Find installed GDM theme, you need to run: 'sudo ./tweaks.sh -g -r' to remove it!"
+  fi
 else
   if [[ "${interactive}" == 'true' ]]; then
     show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
@@ -136,7 +143,7 @@ else
     show_needed_dialogs
   fi
 
-  prompt -w "Removing the old '${name}' themes..."
+  prompt -w "Removing the old '${name}' themes... \n"
 
   remove_themes; customize_theme; avoid_variant_duplicates; echo
 

lib-flatpak.sh

@@ -48,11 +48,7 @@ pakitheme_gtk3() {
   rm -rf "$build_dir"
   mkdir -p "$build_dir/files"
 
-  theme_gtk_version=$(ls -1d "$theme_path"/* 2>/dev/null | grep -Po 'gtk-3\.\K\d+$' | sort -nr | head -1)
-  [[ -n "$theme_gtk_version" ]] || \
-    die "Theme directory did not contain any recognized GTK themes."
-
-  cp -a "$theme_path/gtk-3.$theme_gtk_version/"* "$build_dir/files"
+  cp -a "$theme_path/gtk-3.0/"* "$build_dir/files"
 
   mkdir -p "$build_dir/files/share/appdata"
   cat >"$build_dir/files/share/appdata/$gtk3_app_id.appdata.xml" <<EOF

lib-install.sh

@@ -813,22 +813,10 @@ gtk_base() {
 customize_theme() {
   cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
 
-  # Change gnome-shell panel transparency
-  if [[ "${panel_opacity}" != 'default' ]]; then
-    prompt -s "Changing panel transparency ... \n"
-    sed $SED_OPT "/\$panel_opacity/s/0.15/0.${panel_opacity}/"                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
-  fi
-
-  # Change gnome-shell panel height size
-  if [[ "${panel_size}" != 'default' ]]; then
-    prompt -s "Changing panel height size to '${panel_size}'... \n"
-    sed $SED_OPT "/\$panel_size/s/default/${panel_size}/"                       "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
-  fi
-
-  # Change gnome-shell show apps button style
-  if [[ "${showapps_normal}" == 'true' ]]; then
-    prompt -s "Changing gnome-shell show apps button style ... \n"
-    sed $SED_OPT "/\$showapps_button/s/bigsur/normal/"                          "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  # Darker dark colors
+  if [[ "${darker}" == 'true' ]]; then
+    prompt -s "Changing dark color style to darker one ..."
+    sed $SED_OPT "/\$darker/s/false/true/"                                      "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Change Nautilus sidarbar size
@@ -839,43 +827,61 @@ customize_theme() {
 
   # Change Nautilus style
   if [[ "${nautilus_style}" != 'stable' ]]; then
-    prompt -s "Changing Nautilus style ... \n"
+    prompt -s "Changing Nautilus style ..."
     sed $SED_OPT "/\$nautilus_style/s/stable/${nautilus_style}/"                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Change Nautilus titlebutton placement style
   if [[ "${right_placement}" == 'true' ]]; then
-    prompt -s "Changing Nautilus titlebutton placement style ... \n"
+    prompt -s "Changing Nautilus titlebutton placement style ..."
     sed $SED_OPT "/\$placement/s/left/right/"                                   "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Change maximized window radius
   if [[ "${max_round}" == 'true' ]]; then
-    prompt -s "Changing maximized window style ... \n"
+    prompt -s "Changing maximized window style ..."
     sed $SED_OPT "/\$max_window_style/s/square/round/"                          "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
+  # Change gnome-shell panel transparency
+  if [[ "${panel_opacity}" != 'default' ]]; then
+    prompt -s "Changing panel transparency ..."
+    sed $SED_OPT "/\$panel_opacity/s/0.15/0.${panel_opacity}/"                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
+  # Change gnome-shell panel height size
+  if [[ "${panel_size}" != 'default' ]]; then
+    prompt -s "Changing panel height size to '${panel_size}'..."
+    sed $SED_OPT "/\$panel_size/s/default/${panel_size}/"                       "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
+  # Change gnome-shell show apps button style
+  if [[ "${showapps_normal}" == 'true' ]]; then
+    prompt -s "Changing gnome-shell show apps button style ..."
+    sed $SED_OPT "/\$showapps_button/s/bigsur/normal/"                          "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
   # Change panel font color
   if [[ "${monterey}" == 'true' ]]; then
     black_font="true"
-    prompt -s "Changing to Monterey style ... \n"
+    prompt -s "Changing to Monterey style ..."
     sed $SED_OPT "/\$monterey/s/false/true/"                                    "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
     sed $SED_OPT "/\$panel_opacity/s/0.15/0.5/"                                 "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Change panel font color
   if [[ "${black_font}" == 'true' ]]; then
-    prompt -s "Changing panel font color ... \n"
+    prompt -s "Changing panel font color ..."
     sed $SED_OPT "/\$panel_font/s/white/black/"                                 "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   if [[ "${compact}" == 'false' ]]; then
-    prompt -s "Changing Definition mode to HD (Bigger font, Bigger size) ... \n"
+    prompt -s "Changing Definition mode to HD (Bigger font, Bigger size) ..."
     #FIXME: @vince is it not implemented yet? (Only Gnome-shell and Gtk theme finished!)
   fi
 
   if [[ "${scale}" == 'x2' ]]; then
-    prompt -s "Changing GDM scaling to 200% ... \n"
+    prompt -s "Changing GDM scaling to 200% ..."
     sed $SED_OPT "/\$scale/s/default/x2/"                                       "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 }