[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1142-g802a18a7b

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  802a18a7b4ffdd424d8d1376f6ca89e0d39b63d7 (commit)
      from  8102e2ec58303d5fd9b6fef19847dfa91ba75adb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 802a18a7b4ffdd424d8d1376f6ca89e0d39b63d7
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 17:38:12 2023 +0200

    [debbie] rename chunked dirs to only have language prefix, fix stuff dev renaming

diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index 244378556..5762b7638 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -76,31 +76,48 @@ make epub
 make -e chunked-html-web # TODO: do we really want this too in the doc-html-*.tar.gz package ?
 make html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
 
+STUFF_DIR=/var/www/postgis_stuff/
+
 package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
 tar -czf "$package" --exclude='static' --exclude='wkt' --exclude '*.o' html
+cp $package ${STUFF_DIR}
+
+# TODO: Replace all of this by some `make *-install` rule
+cp *.pdf ${STUFF_DIR}
+cp *.epub ${STUFF_DIR}
 
 # Install all html
 make html-assets-install
 make html-install
-make chunked-html-web-install
 make html-install-localized
+make chunked-html-web-install
 make chunked-html-web-install-localized
-chmod -R 755 ${HTML_DIR} # TODO: still needed ?
-
 
+# Strip out the "postgis-web-" suffix
+# from chunked html directories, backing
+# up any previous target directory
+for f in {HTML_DIR}postgis-web-*; do
+  if test -e $f; then
+    nf=$(echo $f| sed 's/postgis-web-//');
+    if test -e $nf; then
+      rm -rf $nf.old
+      mv -v $nf $nf.old
+    fi
+    mv -v $f $nf;
+  fi
+done
 
-# TODO: Replace all of this by `make *-install`
-cp -R *.pdf /var/www/postgis_stuff/
-cp -R *.epub /var/www/postgis_stuff/
 
-cp -R $package /var/www/postgis_stuff/
+chmod -R 755 ${HTML_DIR} # TODO: still needed ?
 
 
 if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
 
-  #rename the files without the micro if it's a development branch
-  for f in ${WEB_DIR}/{postgis,doc-html}${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.{tar.gz,pdf.epub}; do
-    newname=$(echo "$f" | sed "s/${POSTGIS_MICRO_VERSION}//");
+  # rename the files without the micro if it's a development branch
+  # to avoid proliferation of these packages
+  for f in ${STUFF_DIR}/*-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}-*
+  do
+    newname=$(echo "$f" | sed "s/\.${POSTGIS_MICRO_VERSION}//");
     mv -vi $f $newname
   done
 

-----------------------------------------------------------------------

Summary of changes:
 ci/debbie/postgis_release_docs.sh | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
PostGIS