From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Thu, 5 Nov 2009 00:43:29 +0000 (+0000)
Subject: Remove createdb_opt lines from psql and createlang calls. (#228)
X-Git-Tag: 1.5.0b1~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9798a7c23ca3bd45cd23881a77f9163d99e69671;p=postgis

Remove createdb_opt lines from psql and createlang calls. (#228)


git-svn-id: http://svn.osgeo.org/postgis/trunk@4746 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index c5bab6650..2c24f18cc 100644
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -44,7 +44,7 @@ eval "exec perl -w $0 $@"
 
 use strict;
 
-(@ARGV >= 3) || die "Usage: postgis_restore.pl <postgis.sql> <db> <dump> [<createdb_options>]\nRestore a custom dump (pg_dump -Fc) of a postgis enabled database.\n";
+(@ARGV >= 3) || die "Usage: postgis_restore.pl <postgis.sql> <db> <dump> ["<createdb_options>]\nRestore a custom dump (pg_dump -Fc) of a postgis enabled database.\n";
 
 my $DEBUG=1;
 
@@ -712,12 +712,12 @@ print "Creating db ($dbname)\n";
 `createdb $createdb_opt $dbname`;
 die "Database creation failed\n" if ($?);
 print "Adding plpgsql\n";
-`createlang $createdb_opt plpgsql $dbname`;
+`createlang plpgsql $dbname`;
 
 #
 # Open a pipe to the SQL monitor
 #
-open( PSQL, "| psql $createdb_opt -a $dbname") || die "Can't run psql\n";
+open( PSQL, "| psql -a $dbname") || die "Can't run psql\n";
 
 #
 # Source new postgis.sql