[www] 17/19: use make_sitemap.py

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository www.

commit 3a14d8f71b24cd09fc61c729be9762eff4a56d07
Author: ng0 <address@hidden>
AuthorDate: Wed Nov 13 00:06:15 2019 +0000

    use make_sitemap.py
---
 .gitignore      |  1 +
 GNUmakefile     |  7 ++----
 inc             |  2 +-
 make_sitemap.sh | 74 ---------------------------------------------------------
 4 files changed, 4 insertions(+), 80 deletions(-)

diff --git a/.gitignore b/.gitignore
index b25ec1e..201a9c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ __pycache__
 static/styles.css
 
 sitemap.html
+sitemap.xml
 
 *~
 \#*\#
diff --git a/GNUmakefile b/GNUmakefile
index 4dc2b72..19a7935 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -20,17 +20,14 @@
 include config.mk
 
 all: css locale template
-       ($(cp) -R dist rendered/)
-       ($(cp) -R static rendered/)
        ($(cp) rendered/static/robots.txt rendered/robots.txt)
        ($(cp) rendered/static/stage.robots.txt rendered/stage.robots.txt)
        ($(cp) rendered/static/robots.txt rendered/dist/robots.txt)
        (for lang in en de es fr it ; do \
                $(cp) rendered/static/robots.txt rendered/$$lang/robots.txt ; \
        done)
-       #($(cp) favicon.ico rendered/favicon.ico)
-       ($(sh) make_sitemap.sh)
-       ($(cp) rendered/sitemap.xml rendered/en/sitemap.xml)
+       ($(python) inc/make_sitemap.py -i rendered)
+       ($(cp) sitemap.xml rendered/en/sitemap.xml)
        ($(cp) static/moved.html rendered/frontpage.html)
        (cd rendered; $(ln) -fs frontpage.html frontpage)
        ($(cp) static/moved_gsoc.html rendered/gsoc.html)
diff --git a/inc b/inc
index 4a65973..b91d730 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 4a65973d9a1aae2925d2fada9eed70833d628e33
+Subproject commit b91d7308fc9ab4f0658d180ff563ed0bee35f166
diff --git a/make_sitemap.sh b/make_sitemap.sh
deleted file mode 100755
index bc2578d..0000000
--- a/make_sitemap.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2018, 2019 GNUnet e.V.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-#
-# This initial version builds on code from ssg4
-# copyright is as follows:
-# -----
-# https://www.romanzolotarev.com/bin/ssg4
-# Copyright 2018 Roman Zolotarev <address@hidden>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# -----
-
-list_pages(){
-cd rendered && find . -type f ! -path '*/.*' ! -path '*/_*' -name '*.html' | 
sed 's#^./##;#'
-}
-
-main(){
-       dst=rendered
-        base_url="$4"
-        date=$(date +%Y-%m-%d)
-        urls=$(list_pages "$src")
-
-        test -n "$urls" &&
-        render_sitemap "$urls" "$base_url" "$date" > "$dst/sitemap.xml"
-
-        print_status 'url' 'urls' "$urls" >&2
-        echo >&2
-}
-
-print_status() {
-        test -z "$3" && printf 'no %s' "$2" && return
-
-        echo "$3" | awk -v singular="$1" -v plural="$2" '
-        END {
-                if (NR==1) printf NR " " singular
-                if (NR>1) printf NR " " plural
-        }'
-}
-
-render_sitemap() {
-        urls="$1"
-        base_url="$2"
-        date="$3"
-
-        echo '<?xml version="1.0" encoding="UTF-8"?>'
-        echo '<urlset'
-        echo 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";'
-        echo 'xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9'
-        echo 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd";'
-        echo 'xmlns="http://www.sitemaps.org/schemas/sitemap/0.9";>'
-        echo "$urls" |
-        sed -E 's#^(.*)$#<url><loc>'"$base_url"'/\1</loc><lastmod>'\
-"$date"'</lastmod><priority>1.0</priority></url>#'
-        echo '</urlset>'
-}
-
-main "$@"
-

-- 
To stop receiving notification emails like this one, please contact
address@hidden.