From 7e50879d0dceb4b7e67dc1add6276c4d244e51f5 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 15 Jan 2018 23:23:17 +0000 Subject: [PATCH] change to call with bash instead of sh, get rid of re-autogen would have been already done. git-svn-id: http://svn.osgeo.org/postgis/trunk@16311 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/debbie/postgis_make_dist.sh | 2 +- ci/debbie/postgis_release_docs.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/debbie/postgis_make_dist.sh b/ci/debbie/postgis_make_dist.sh index 94c767686..0a3e8e849 100644 --- a/ci/debbie/postgis_make_dist.sh +++ b/ci/debbie/postgis_make_dist.sh @@ -32,4 +32,4 @@ export package=${newoutdir}.tar.gz echo "The package name is $package" cp $package $WEB_DIR -sh ci/debbie/postgis_release_docs.sh +bash ci/debbie/postgis_release_docs.sh diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh index a10c95818..a76b896b5 100644 --- a/ci/debbie/postgis_release_docs.sh +++ b/ci/debbie/postgis_release_docs.sh @@ -22,7 +22,7 @@ POSTGIS_MICRO_VERSION=`grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2` chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} echo $PATH -sh autogen.sh +#sh autogen.sh if [ -f GNUMakefile ]; then make distclean @@ -43,8 +43,9 @@ cd doc mv postgis.xml postgis.xml.orig #sed -e "s::SVN Revision (${POSTGIS_SVN_REVISION}):" postgis.xml.orig > postgis.xml +echo "Micro: $POSTGIS_MICRO_VERSION" #inject a development time stamp if we are in development branch -if [[ $POSTGIS_MICRO_VERSION == *"dev"* ]]; then +if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then export GIT_TIMESTAMP=`git log -1 --pretty=format:%ct` sed -e "s::DEV TIMESTAMP (${GIT_TIMESTAMP}):" postgis.xml.orig > postgis.xml fi -- 2.40.0