www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/source gen-include-file-list


From: Pavel Kharitonov
Subject: www/server/source gen-include-file-list
Date: Sat, 24 Dec 2011 05:24:39 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       11/12/24 05:24:39

Modified files:
        server/source  : gen-include-file-list 

Log message:
        Fixes and updates.
        
        Fix a bug (don't omit includes like /licenses/gpl-3.0-body.html),
          RT #718495.
        
        Add a comment about the nature of the file to the output.
        
        Set LC_ALL=C.
        
        Say in the comments that it runs from address@hidden rather than
          address@hidden

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/source/gen-include-file-list?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: gen-include-file-list
===================================================================
RCS file: /web/www/www/server/source/gen-include-file-list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gen-include-file-list       17 Feb 2011 18:48:15 -0000      1.2
+++ gen-include-file-list       24 Dec 2011 05:24:34 -0000      1.3
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: gen-include-file-list,v 1.2 2011/02/17 18:48:15 karl Exp $
+# $Id: gen-include-file-list,v 1.3 2011/12/24 05:24:34 ineiev Exp $
 # Copyright 2011 Free Software Foundation, Inc.
 # 
 # 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 is run from address@hidden cron.
+# This is run from address@hidden cron.
 # 
 # The idea is to generate a list of the SSI fragments included in other
 # pages.  We don't want Apache to localize those with MultiViews, since
@@ -22,6 +22,14 @@
 # Root of hierarchy to search, the main web directory by default.
 webroot=${1-`cd ../.. && pwd`}
 
+# Use consistent sorting.
+LC_ALL=C
+
+# Output header
+echo -n '#' Generated by gen-include-file-list on' '
+date
+echo '#' Do not edit.
+
 # Look for ssi statements in .html and .shtml, nothing else.
 find $webroot -type f \( -name \*.html -o -name \*.shtml \) \
 | while read i; do
@@ -34,7 +42,7 @@
     # such as header.de.html and header.pt-br.html.
 
     sed -n 's/^.*#include virtual="\([^"]*\)\.html".*$/\1/p' $i \
-    | grep -v "\...\(-..\)\?"
+    | grep -v "\...\(-..\)\?$"
    done \
 | sort -u \
 | sed "s/\(.*\)/\1 \1.en/"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]