diff --git a/packdist.sh b/packdist.sh index 85fb5a0f1..ccd4917f6 100755 --- a/packdist.sh +++ b/packdist.sh @@ -70,60 +70,56 @@ genchanges() { # generate links in old textile format "text":url genlinks_changes() { local repourl ticketurl inf out - repourl="https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/" + #repourl="https://redmine.lighttpd.net/projects/lighttpd/repository/svn/revisions/" ticketurl="https://redmine.lighttpd.net/issues/" inf="$1" outf="$1".links ( - sed -e 's%\(https://[a-zA-Z0-9.:_/\-]\+\)%"\1":\1%g' | - sed -e 's%#\([0-9]\+\)%"#\1":'"${ticketurl}"'\1%g' | - sed -e 's%r\([0-9]\+\)%"r\1":'"${repourl}"'\1%g' | - sed -e 's%\(CVE-[0-9\-]\+\)%"\1":https://cve.mitre.org/cgi-bin/cvename.cgi?name=\1%g' | - cat + sed -e 's%\(\[\|\]\)%\\\1%g' \ + -e 's%\(.\)\*%\1\\*%g' \ + -e 's% _% \\_%g' \ + -e 's%\(https://[a-zA-Z0-9.:_/\-]\+\)%[\1](\1)%g' \ + -e 's%#\([0-9]\+\)%[#\1]('"${ticketurl}"'\1)%g' \ + -e 's%\(CVE-[0-9\-]\+\)%[\1](https://cve.mitre.org/cgi-bin/cvename.cgi?name=\1)%g' + #(svn-historical) sed -e 's%r\([0-9]\+\)%[r\1]('"${repourl}"'\1)%g' | ) < "$inf" > "$outf" } -genlinks_downloads() { - local repourl ticketurl inf out - repourl="https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/" - ticketurl="https://redmine.lighttpd.net/issues/" - inf="$1" - outf="$1".links - ( - sed -e 's%\(https://[a-zA-Z0-9.:_/\-]\+\)%"\1":\1%g' | - cat - ) < "$inf" > "$outf" -} - -blog_post() { +#genlinks_downloads() { +# local inf out +# inf="$1" +# outf="$1".links +# ( +# sed -e 's%\(https://[a-zA-Z0-9.:_/\-]\+\)%[\1](\1)%g' +# ) < "$inf" > "$outf" +#} + +www_l_n_post() { if [ -z "${append}" ]; then # release cat < -{% endexcerpt %} +{%- endexcerpt %} -h4. Changes from ${prevversion} +#### Changes from ${prevversion} EOF cat CHANGES.links cat < DOWNLOADS ( - echo "* \"${name}.tar.gz\":${BASEDOWNLOADURL}/${name}.tar.gz (\"GPG signature\":${BASEDOWNLOADURL}/${name}.tar.gz.asc)" - echo "** SHA256: @$(sha256sum ${name}.tar.gz | cut -d' ' -f1)@" - echo "* \"${name}.tar.xz\":${BASEDOWNLOADURL}/${name}.tar.xz (\"GPG signature\":${BASEDOWNLOADURL}/${name}.tar.xz.asc)" - echo "** SHA256: @$(sha256sum ${name}.tar.xz | cut -d' ' -f1)@" - echo "* \"SHA256 checksums\":${BASEDOWNLOADURL}/${name}.sha256sum" - echo "* \"SHA512 checksums\":${BASEDOWNLOADURL}/${name}.sha512sum" + echo "* [${name}.tar.gz](${BASEDOWNLOADURL}/${name}.tar.gz) ([GPG signature](${BASEDOWNLOADURL}/${name}.tar.gz.asc))" + echo " * SHA256: \`$(sha256sum ${name}.tar.gz | cut -d' ' -f1)\`" + echo "* [${name}.tar.xz](${BASEDOWNLOADURL}/${name}.tar.xz) ([GPG signature](${BASEDOWNLOADURL}/${name}.tar.xz.asc))" + echo " * SHA256: \`$(sha256sum ${name}.tar.xz | cut -d' ' -f1)\`" + echo "* [SHA256 checksums](${BASEDOWNLOADURL}/${name}.sha256sum)" + echo "* [SHA512 checksums](${BASEDOWNLOADURL}/${name}.sha512sum)" ) > DOWNLOADS.links force genchanges @@ -238,6 +232,7 @@ force genlinks_changes CHANGES #force genlinks_downloads DOWNLOADS prevversion="${version%.*}.$((${version##*.} - 1))" +isodate=$(date +"%Y-%m-%d") if [ -z "${append}" ]; then # only for Releases @@ -251,7 +246,7 @@ h1. Release Info * Status: stable * Release Purpose: bug fixes * Release manager: $AUTHOR -* Released date: $(date +"%Y-%m-%d") +* Released date: ${isodate} h1. Important changes from ${prevversion} @@ -283,10 +278,7 @@ echo echo ------- echo - - -blog_post > $(date +"%Y-%m-%d")-"${version}.textile" -cat $(date +"%Y-%m-%d")-"${version}.textile" +www_l_n_post | tee ${isodate}-"${version}.md" echo echo -------