Revert "Make install quit ignoring dbname and dbuser options"

I should probably have run the test suite before committing...

This reverts commit 39dcde241abcdfcc45415d2eb210d8b2c694f479.

diff --git a/bucardo b/bucardo
index 1759c42f4dc7e66a1d30087d9f73de27cebe5bbc..ef147ac837ccc916d8f678d4fba9c5dfe9fb2439 100755 (executable)
--- a/bucardo
+++ b/bucardo
@@ -7725,10 +7725,10 @@ sub install {
     }
 
     ## Setup our default arguments for the installation choices
-    my $host   = $bcargs->{dbhost} || $ENV{PGHOST} || '<none>';
-    my $port   = $bcargs->{dbport} || $ENV{PGPORT} || 5432;
-    my $user   = $bcargs->{dbuser} || $ENV{DBUSER} || 'postgres';
-    my $dbname = $bcargs->{dbname} || $ENV{DBNAME} || 'postgres';
+    my $host = $bcargs->{dbhost} || $ENV{PGHOST} || '<none>';
+    my $port = $bcargs->{dbport} || $ENV{PGPORT} || 5432;
+    my $user = $ENV{DBUSER} || 'postgres';
+    my $dbname = $ENV{DBNAME} || 'postgres';
 
     ## Make sure the bucardo.schema file is available, and extract some config items
     my ($fh, $schema_file) = find_bucardo_schema();