Source Format Enforcement (#763)

[thirdparty/squid.git] / mksnapshot-cron.sh

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index 4244b795b2e46f98e141a65a488d16ef669cc4aa..caef23395987cfebfbe0d4b91866a95acf8dbfd9 100755 (executable)
--- a/mksnapshot-cron.sh
+++ b/mksnapshot-cron.sh
@@ -1,4 +1,12 @@
 #!/bin/sh -e
+#
+## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 echo "RUN: $0"
 # Nightly cron job to generate snapshot releases
 top=${PWD}
@@ -58,10 +66,18 @@ make_snapshot()
     rm -f ${dst}/squid-${ver}.snapshot${type}.md5
     ln -s ${file}.md5 ${dst}/squid-${ver}.snapshot${type}.md5
 
+  set +e
     # cleanup old snapshots
-    ls ${dst}/*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]${type} | sed -e 's/.*-\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'${type}'\)/\1/' | sort -r | tail +${save} | while read f; do
-       rm -f ${dst}/*-${f} ${dst}/*-${f}.md5
+    ls ${dst}/*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-r*[0-9]${type} | \
+#              sed -e 's/.*-\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-r[0-9]+'${type}'\)/\1/' | \
+               sort -r | tail +${save} | \
+    while read f; do
+       rm -f ${f} ${f}.md5
     done
+  set -e
+
+    # update dynamic index pages Last-Modified info
+    touch ${dst}/index.dyn
 
     # Special cases
     case ${file} in
@@ -88,24 +104,30 @@ make_snapshot()
 set +e
 
 # autotool derived files not kept in trunk, but still need to bootstrap for make dist
-../commit/bootstrap squid-3
-make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6
+#../commit/bootstrap squid-3
+#make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6
+
+#rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
+#cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
+#chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
+#mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/content/CONTRIBUTORS.txt
+#
+#rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new
+#cp ../commit/squid-3/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new
+#chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new
+#mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt
 
-rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/content/CONTRIBUTORS.txt
+../commit/bootstrap squid-3.4
+make_snapshot ../commit/squid-3/mksnapshot.sh 3.4 v3 3.4 30
 
-rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-cp ../commit/squid-3/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt
+../commit/bootstrap squid-3.3
+make_snapshot ../commit/squid-3/mksnapshot.sh 3.3 v3 3.3 30
 
-../commit/bootstrap squid-3.2
-make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_2 v3 3.2 5
+#../commit/bootstrap squid-3.2
+#make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_2 v3 3.2 30
 
-../commit/bootstrap squid-3.1
-make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 3
+#../commit/bootstrap squid-3.1
+#make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 30
 
 #../commit/bootstrap squid-3.0
 #make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_0 v3 3.0 3
@@ -123,3 +145,8 @@ make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 3
 #make_snapshot ../commit/squid-2.5/mksnapshot.sh SQUID_2_5 v2 2.5 3
 
 #../commit/squid3-SQUID2.sync
+
+
+../commit/bootstrap squid-3.5
+make_snapshot ../commit/squid-3/mksnapshot.sh 3.5 v3 3.5 30
+