From 2a0f4578efdda44325df9b32ff5f1790ca1e7752 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 13 Mar 2012 22:21:38 +0000 Subject: [PATCH] Fixed #17584 -- Updated create_template_postgis-debian.sh script for PostgreSQL 9.1 installs. Thanks akaihola for the initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17706 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../gis/create_template_postgis-debian.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/ref/contrib/gis/create_template_postgis-debian.sh b/docs/ref/contrib/gis/create_template_postgis-debian.sh index 61bbef40a1..ac9641d168 100755 --- a/docs/ref/contrib/gis/create_template_postgis-debian.sh +++ b/docs/ref/contrib/gis/create_template_postgis-debian.sh @@ -1,5 +1,8 @@ #!/bin/bash +GEOGRAPHY=0 +POSTGIS_SQL=postgis.sql + # For Ubuntu 8.x and 9.x releases. if [ -d "/usr/share/postgresql-8.3-postgis" ] then @@ -11,21 +14,24 @@ fi if [ -d "/usr/share/postgresql/8.4/contrib" ] then POSTGIS_SQL_PATH=/usr/share/postgresql/8.4/contrib - POSTGIS_SQL=postgis.sql fi # For Ubuntu 10.10 (with PostGIS 1.5) if [ -d "/usr/share/postgresql/8.4/contrib/postgis-1.5" ] then POSTGIS_SQL_PATH=/usr/share/postgresql/8.4/contrib/postgis-1.5 - POSTGIS_SQL=postgis.sql GEOGRAPHY=1 -else - GEOGRAPHY=0 +fi + +# For Ubuntu 11.10 / Linux Mint 12 (with PostGIS 1.5) +if [ -d "/usr/share/postgresql/9.1/contrib/postgis-1.5" ] +then + POSTGIS_SQL_PATH=/usr/share/postgresql/9.1/contrib/postgis-1.5 + GEOGRAPHY=1 fi createdb -E UTF8 template_postgis && \ -createlang -d template_postgis plpgsql && \ +( createlang -d template_postgis -l | grep plpgsql || createlang -d template_postgis plpgsql ) && \ psql -d postgres -c "UPDATE pg_database SET datistemplate='true' WHERE datname='template_postgis';" && \ psql -d template_postgis -f $POSTGIS_SQL_PATH/$POSTGIS_SQL && \ psql -d template_postgis -f $POSTGIS_SQL_PATH/spatial_ref_sys.sql && \