diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bf7850a..0650531 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh diff --git a/demo/install.sh.in b/demo/install.sh.in index a2bd50b..535ffa1 100755 --- a/demo/install.sh.in +++ b/demo/install.sh.in @@ -11,7 +11,11 @@ PGUSER=postgres SHP2PGSQL=@SHP2PGSQL@ DB=tinyows_demo -if [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then +if [ -d /usr/local/pgsql/share/contrib/postgis-3.3 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.3 +elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2 +elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0