diff --git a/install.sh b/install.sh index 3e0c6a70..54f7a2d9 100755 --- a/install.sh +++ b/install.sh @@ -185,8 +185,8 @@ else prompt -i "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )" prompt -i "Alt variants : $( IFS=';'; echo "${alts[*]}" )" prompt -i "Scheme variants : $( IFS=';'; echo "${schemes[*]}" )" - prompt -i "Icon variant : ${icon}" - prompt -i "Nautilus variant : ${nautilus_style}" + prompt -i "Start icon style : ${icon}" + prompt -i "Nautilus style : ${nautilus_style}" echo; install_themes; echo; prompt -s "Done!" diff --git a/libs/lib-install.sh b/libs/lib-install.sh index ac8b8be8..ff0a56e2 100755 --- a/libs/lib-install.sh +++ b/libs/lib-install.sh @@ -115,7 +115,7 @@ prepare_swupd() { install_swupd_packages() { if [[ ! "${swupd_packages}" ]]; then - swupd_packages="$(curl -s -o - "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')" + swupd_packages=$(curl -s -o - "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}') fi for key in "${@}"; do diff --git a/make-release.sh b/make-release.sh index c391ad5f..c2139dac 100755 --- a/make-release.sh +++ b/make-release.sh @@ -14,11 +14,9 @@ N_VARIANTS=('' '-nord') install() { remove_themes; customize_theme; avoid_variant_duplicates + local schemes=("${SCHEME_VARIANTS[@]}") install_themes echo; prompt -s "Install GNOME ${RELEASE_VERSION} version finished!\n" - local schemes=("${SCHEME_VARIANTS[1]}") - install_themes - echo; prompt -s "Install GNOME ${RELEASE_VERSION} Nord version finished!\n" } compress() { @@ -41,6 +39,24 @@ compress() { done } +release_info() { +rm -rf ${RELEASE_DIR}/release-info.txt + +echo >> release-info.txt +echo "VERSION: (GNOME-SHELL) ${RELEASE_VERSION}" >> ${RELEASE_DIR}/release-info.txt +echo >> ${RELEASE_DIR}/release-info.txt +echo "RELEASE TIME: $(date)" >> ${RELEASE_DIR}/release-info.txt +echo >> ${RELEASE_DIR}/release-info.txt +echo "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---" >> ${RELEASE_DIR}/release-info.txt +echo "Color variants : $( IFS=';'; echo "${colors[*]}" )" >> ${RELEASE_DIR}/release-info.txt +echo "Theme variants : $( IFS=';'; echo "${themes[*]}" )" >> ${RELEASE_DIR}/release-info.txt +echo "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )" >> ${RELEASE_DIR}/release-info.txt +echo "Alt variants : $( IFS=';'; echo "${alts[*]}" )" >> ${RELEASE_DIR}/release-info.txt +echo "Scheme variants : $( IFS=';'; echo "${SCHEME_VARIANTS[*]}" )" >> ${RELEASE_DIR}/release-info.txt +echo "Start icon style : ${icon}" >> ${RELEASE_DIR}/release-info.txt +echo "Nautilus style : ${nautilus_style}" >> ${RELEASE_DIR}/release-info.txt +} + #GNOME_VERSION="3-28" #RELEASE_VERSION="-3-38" #install && compress @@ -50,6 +66,7 @@ GNOME_VERSION="47-0" RELEASE_VERSION="47.0" install && compress prompt -i "Compress ${THEME_NAME} themes finished!\n" - +release_info prompt -s "Done!"; echo + exit 0 diff --git a/release-info.txt b/release-info.txt new file mode 100644 index 00000000..d5292de1 --- /dev/null +++ b/release-info.txt @@ -0,0 +1,34 @@ +VERSION: (GNOME-SHELL) 47.0 +2024年 10月 30日 星期三 20:53:18 CST +--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<--- +Color variants : Light;Dark +Theme variants : default +Opacity variants : normal;solid +Alt variants : normal +Scheme variants : standard +Start icon style : apple +Nautilus style : stable +VERSION: (GNOME-SHELL) 47.0 + +2024年 10月 30日 星期三 20:53:52 CST + +--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<--- +Color variants : Light;Dark +Theme variants : default +Opacity variants : normal;solid +Alt variants : normal +Scheme variants : standard +Start icon style : apple +Nautilus style : stable +VERSION: (GNOME-SHELL) 47.0 + +2024年 10月 30日 星期三 20:54:12 CST + +--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<--- +Color variants : Light;Dark +Theme variants : default +Opacity variants : normal;solid +Alt variants : normal +Scheme variants : standard +Start icon style : apple +Nautilus style : stable diff --git a/release/WhiteSur-Dark-nord.tar.xz b/release/WhiteSur-Dark-nord.tar.xz index 0b8e700c..4041ca4e 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 9bdeae89..7136f43e 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 ff52723a..677b5419 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 5ec7694b..970d7db8 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 e8b02d3a..ce7eb55f 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 65c50df7..e045aaff 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 888dcd7c..3d33cee3 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 143d434d..0621e322 100644 Binary files a/release/WhiteSur-Light.tar.xz and b/release/WhiteSur-Light.tar.xz differ diff --git a/release/release-info.txt b/release/release-info.txt new file mode 100644 index 00000000..106bd17c --- /dev/null +++ b/release/release-info.txt @@ -0,0 +1,12 @@ +VERSION: (GNOME-SHELL) 47.0 + +RELEASE TIME: 2024年 10月 30日 星期三 21:08:48 CST + +--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<--- +Color variants : Dark;Light +Theme variants : default +Opacity variants : normal;solid +Alt variants : normal +Scheme variants : standard;nord +Start icon style : apple +Nautilus style : stable