summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-03-13 22:25:10 +0000
committerClaude Paroz <claude@2xlibre.net>2012-03-13 22:25:10 +0000
commitddfa89b959a03417fc3eb24738b0cb1049940e5d (patch)
tree332e27bb5110be0cf7cc53637bf7c7c1b8efb227
parent695187902367882e59136fd3ef6fa9e0363869fa (diff)
Fixed #17584 -- Updated create_template_postgis-debian.sh script for PostgreSQL 9.1 installs. Thanks akaihola for the initial patch.
Backport of r17706 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rwxr-xr-xdocs/ref/contrib/gis/create_template_postgis-debian.sh16
1 files 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 && \