diff --git a/make-release.sh b/make-release.sh index 3e420a7e..d0b51806 100755 --- a/make-release.sh +++ b/make-release.sh @@ -15,7 +15,7 @@ N_VARIANTS=('' '-nord') install() { remove_themes; customize_theme; avoid_variant_duplicates install_themes; echo; prompt -s "Install Gnome${RELEASE_VERSION} version finished!"; echo - local colorscheme="-nord" + local schemes=("${SCHEME_VARIANTS[1]}") install_themes; echo; prompt -s "Install Gnome${RELEASE_VERSION} nord version finished!"; echo } diff --git a/release/WhiteSur-Dark-nord.tar.xz b/release/WhiteSur-Dark-nord.tar.xz index 415193d1..cfddd1fa 100644 Binary files a/release/WhiteSur-Dark-nord.tar.xz and b/release/WhiteSur-Dark-nord.tar.xz differ diff --git a/release/WhiteSur-Dark-solid-nord.tar.xz b/release/WhiteSur-Dark-solid-nord.tar.xz index a9e7c943..e83dae06 100644 Binary files a/release/WhiteSur-Dark-solid-nord.tar.xz and b/release/WhiteSur-Dark-solid-nord.tar.xz differ diff --git a/release/WhiteSur-Dark-solid.tar.xz b/release/WhiteSur-Dark-solid.tar.xz index 62cd9153..3583288a 100644 Binary files a/release/WhiteSur-Dark-solid.tar.xz and b/release/WhiteSur-Dark-solid.tar.xz differ diff --git a/release/WhiteSur-Dark.tar.xz b/release/WhiteSur-Dark.tar.xz index 50748d59..adc3e6a3 100644 Binary files a/release/WhiteSur-Dark.tar.xz and b/release/WhiteSur-Dark.tar.xz differ diff --git a/release/WhiteSur-Light-nord.tar.xz b/release/WhiteSur-Light-nord.tar.xz index 1edd7852..e1efade7 100644 Binary files a/release/WhiteSur-Light-nord.tar.xz and b/release/WhiteSur-Light-nord.tar.xz differ diff --git a/release/WhiteSur-Light-solid-nord.tar.xz b/release/WhiteSur-Light-solid-nord.tar.xz index ceab3d7d..fbd878cc 100644 Binary files a/release/WhiteSur-Light-solid-nord.tar.xz and b/release/WhiteSur-Light-solid-nord.tar.xz differ diff --git a/release/WhiteSur-Light-solid.tar.xz b/release/WhiteSur-Light-solid.tar.xz index 70694652..5bed03f0 100644 Binary files a/release/WhiteSur-Light-solid.tar.xz and b/release/WhiteSur-Light-solid.tar.xz differ diff --git a/release/WhiteSur-Light.tar.xz b/release/WhiteSur-Light.tar.xz index 21166ffd..ba3e7f0e 100644 Binary files a/release/WhiteSur-Light.tar.xz and b/release/WhiteSur-Light.tar.xz differ diff --git a/shell/lib-core.sh b/shell/lib-core.sh index 155cf84b..92d2506b 100755 --- a/shell/lib-core.sh +++ b/shell/lib-core.sh @@ -500,6 +500,8 @@ check_param() { colors=() ;; -t) themes=() ;; + -s) + schemes=() ;; esac fi diff --git a/shell/lib-install.sh b/shell/lib-install.sh index ff3fb7df..a808f56a 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -500,15 +500,7 @@ install_theemy() { } remove_packy() { - rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})$(destify ${5})" - rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${5})-hdpi" - rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${5})-xhdpi" -} - -remove_old_packy() { - rm -rf "${dest}/${name}${1}$(destify ${2})$(destify ${3})$(destify ${4})${5}" - rm -rf "${dest}/${name}${1}${5}-hdpi" - rm -rf "${dest}/${name}${1}${5}-xhdpi" + rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})$(destify ${5})"{'','-hdpi','-xhdpi'} } ############################################################################### @@ -545,6 +537,8 @@ install_libadwaita() { color="${colors[0]}" opacity="${opacities[0]}" + echo -e "${color} ${opacity} ${alt} ${theme} ${scheme}" + gtk_base && config_gtk4 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" } @@ -606,18 +600,6 @@ remove_themes() { done done -# for color in '-light' '-dark'; do -# for opacity in "${OPACITY_VARIANTS[@]}"; do -# for alt in "${ALT_VARIANTS[@]}"; do -# for theme in "${THEME_VARIANTS[@]}"; do -# for scheme in '' '-nord'; do -# remove_old_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" -# done -# done -# done -# done -# done - wait ${process_ids[*]} &> /dev/null }