[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/source update-recent-releases
|
From: |
Ineiev |
|
Subject: |
www/server/source update-recent-releases |
|
Date: |
Mon, 24 Jun 2019 07:55:51 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: Ineiev <ineiev> 19/06/24 07:55:51
Modified files:
server/source : update-recent-releases
Log message:
Backport from gnun-scripts: directory selection.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/source/update-recent-releases?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: update-recent-releases
===================================================================
RCS file: /web/www/www/server/source/update-recent-releases,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- update-recent-releases 24 Jun 2019 11:37:01 -0000 1.9
+++ update-recent-releases 24 Jun 2019 11:55:50 -0000 1.10
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: update-recent-releases,v 1.9 2019/06/24 11:37:01 ineiev Exp $
+# $Id: update-recent-releases,v 1.10 2019/06/24 11:55:50 ineiev Exp $
# Public domain. Originally written by Karl Berry, January 2013.
# This script is run (more than daily) from gnun@fencepost cron.
#
@@ -17,17 +17,22 @@
#
# We assume GNU date and a decent sed.
+www_software_dir=`pwd`
+
if test $# -gt 0; then
www_software_dir=$1
-else
- mydir=`dirname $0` # WWW/server/source
- www_software_dir=`cd $mydir/../../software/ && pwd`
fi
cd $www_software_dir || exit 1
-# need to work in tmp dir. This is .cvsignored.
-test -d recent-releases-tmp || mkdir recent-releases-tmp
-cd recent-releases-tmp || exit 1
+var_dir="$www_software_dir/recent-releases-tmp"
+
+if test $# -gt 1; then
+ var_dir=$2
+fi
+
+# Need to work in tmp dir.
+test -d "$var_dir" || mkdir "$var_dir"
+cd "$var_dir" || exit 1
wget="wget -q"
info_gnu=http://lists.gnu.org/archive/html/info-gnu
@@ -73,7 +78,7 @@
}
(fix_month $thismonth.html $thismonth; fix_month lastmonth.html $lastmonth) \
->../recent-releases-include.html
+ > "$www_software_dir/recent-releases-include.html"
# Make HTML elements like links invisible for the translators.
sed '1 i\
@@ -89,10 +94,10 @@
var="TIME" value="\1" --><!--#echo encoding="none" var="TIME" -->:
}' -i ../recent-releases-include.html
-cd .. || exit 1
+cd "$www_software_dir" || exit 1
validate_file () {
- (echo '<html>'; cat $1; echo '</html>') | xmllint --noout - 2> /dev/null
+ (echo '<html>'; cat "$1"; echo '</html>') | xmllint --noout - 2> /dev/null
}
# Try to fix validation errors.
@@ -101,10 +106,10 @@
else
echo "$0: fixing validation errors."
sed 's,^</li></ul>$,</ul></li>,' recent-releases-include.html \
- > recent-releases-tmp/recent-releases-include.html
- if validate_file recent-releases-tmp/recent-releases-include.html; then
+ > "$var_dir/recent-releases-include.html"
+ if validate_file "$var_dir/recent-releases-include.html"; then
echo "$0: the errors were fixed."
- cp recent-releases-tmp/recent-releases-include.html .
+ cp "$var_dir/recent-releases-include.html" .
else
echo "$0: failed to fix."
fi