From 2f5226c5a72a5556418b75f727a6ec6bfba8fb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sat, 6 Apr 2013 22:26:02 +0200 Subject: [PATCH] [scripts] gen_html: add support for monthly ISOs Additionally, daily.tmpl skips now 'daily' and 'monthly' under Other. --- scripts/gen_html/daily.tmpl | 1 + scripts/gen_html/gen.sh | 21 ++++- scripts/gen_html/main.tmpl | 1 + scripts/gen_html/monthly.tmpl | 163 ++++++++++++++++++++++++++++++++++ scripts/gen_html/templ+abc.pl | 2 +- 5 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 scripts/gen_html/monthly.tmpl diff --git a/scripts/gen_html/daily.tmpl b/scripts/gen_html/daily.tmpl index a98cfd2..6c05c0a 100644 --- a/scripts/gen_html/daily.tmpl +++ b/scripts/gen_html/daily.tmpl @@ -16,6 +16,7 @@
diff --git a/scripts/gen_html/gen.sh b/scripts/gen_html/gen.sh index c313d8b..92ca6ee 100755 --- a/scripts/gen_html/gen.sh +++ b/scripts/gen_html/gen.sh @@ -17,16 +17,17 @@ fi iso_dir_prefix="/sabayon/rsync/rsync.sabayon.org/iso" main_dir=$iso_dir_prefix dailies_dir=$iso_dir_prefix/daily +monthly_dir=$iso_dir_prefix/monthly unset iso_dir_prefix -for dir in "$main_dir" "$dailies_dir"; do +for dir in "$main_dir" "$dailies_dir" "$monthly_dir"; do if [ ! -d "$dir" ]; then warn "'$dir' doesn't exist or is not a directory" exit 2 fi done -common_args="--skip .. --skip main.html --skip daily.html --skip style.css" +common_args="--skip .. --skip main.html --skip daily.html --skip monthly.html --skip style.css" tmpfile="$script_dir/tmp.html" @@ -38,6 +39,7 @@ fi # main if ! "$script" $common_args \ main --template "$script_dir/main.tmpl" --dir "$main_dir" \ + --skip daily --skip monthly \ > "$tmpfile"; then warn "script for main releases failed" rm -f "$tmpfile" @@ -65,6 +67,21 @@ if ! mv "$tmpfile" "$dailies_dir/daily.html"; then exit 2 fi +# monthly +if ! "$script" $common_args \ + main --template "$script_dir/monthly.tmpl" --dir "$monthly_dir" \ + > "$tmpfile"; then + warn "script for monthly releases failed" + rm -f "$tmpfile" + exit 2 +fi + +if ! mv "$tmpfile" "$monthly_dir/monthly.html"; then + warn "mv $tmpfile $monthly_dir/monthly failed" + rm -f "$tmpfile" + exit 2 +fi + # CSS if ! cp "$script_dir/style.css" "$main_dir/"; then warn "cp $script_dir/style.css $main_dir/ failed" diff --git a/scripts/gen_html/main.tmpl b/scripts/gen_html/main.tmpl index 278afcf..f70df72 100644 --- a/scripts/gen_html/main.tmpl +++ b/scripts/gen_html/main.tmpl @@ -16,6 +16,7 @@
diff --git a/scripts/gen_html/monthly.tmpl b/scripts/gen_html/monthly.tmpl new file mode 100644 index 0000000..647da50 --- /dev/null +++ b/scripts/gen_html/monthly.tmpl @@ -0,0 +1,163 @@ + + + + + Sabayon Linux + + + + +

+ + skip to download links + +

+ +
+ +
+ +

+  +

+ +

+Sabayon comes in different flavours to choose.
+To distinguish between them, a suffix is appended to file names.
+Here's a short description. More details can be found in this thread on Sabayon forum. +

+ +

main releases:

+
+
G
+
This version contains the well known GNOME 3.
+
K
+
This version comes with KDE SC, another popular desktop environment.
+
Xfce
+
Contains Xfce - lightweight yet very functional and friendly desktop.
+
MATE
+
With the GNOME 2 fork.
+
+ + + +

additionally, these Core releases are available:

+ +
+
SpinBase
+
It's a very minimal environment that can be used for many different purposes: didactical, home server deployment, and even for custom Sabayon ISO images creation, using our tool called Molecule. Any Sabayon release we make is based on SpinBase.
+
CoreCDX
+
It's geared towards very minimal graphical environment setup, no fancy tools, browsers, whatever, just Fluxbox and command line.
+
ServerBase
+
It's very similar to SpinBase, but powered by a server-optimized Linux kernel (package: sys-kernel/linux-server).
+ +
+ +

+All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.
+SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX should be preferred for non-standard filesystem/partition layouts. +

+ +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameArchitectureDownload linkTorrentmd5sumPackage listSizeDate
"> + + + + + + ">download + + ??? + + + + ">torrent + + N/A + + + + ">md5sum + + N/A + + + + ">package list + + N/A + + + + + + N/A + + + + + + N/A + +
+

All dates are in day-month-year format.

+ + +

+ Other:
+ + "> + + +
+ +

+ + + + diff --git a/scripts/gen_html/templ+abc.pl b/scripts/gen_html/templ+abc.pl index 8a71ced..15c4b4f 100755 --- a/scripts/gen_html/templ+abc.pl +++ b/scripts/gen_html/templ+abc.pl @@ -196,7 +196,7 @@ sub parse_entry { # If numeration schema changes, look at $re_ver. :) # $re_ver part can't be too loose because it would match something else # than release type... - my $re_ver = "(?DAILY|[0-9]+)"; + my $re_ver = "(?DAILY|[0-9.]+)"; my $fmt = sub { my ($ver, $ed) = @_;