Make installation quieter when in batch mode

diff --git a/bucardo b/bucardo
index b9a2dbd1de9b759fefc1fc429af34c8c7c8f4830..04e259f515bcb67ff491ad6b7c988e514095d862 100755 (executable)
--- a/bucardo
+++ b/bucardo
@@ -7587,13 +7587,16 @@ sub install {
   GOOEY:
     {
 
-        print "Current connection settings:\n";
+        ## We only don't print this in quiet batch mode
+        if (! $QUIET or ! $bcargs->{batch}) {
+            print "Current connection settings:\n";
 
-        print "1. Host:           $host\n";
-        print "2. Port:           $port\n";
-        print "3. User:           $user\n";
-        print "4. Database:       $dbname\n";
-        print "5. PID directory:  $piddir\n";
+            print "1. Host:           $host\n";
+            print "2. Port:           $port\n";
+            print "3. User:           $user\n";
+            print "4. Database:       $dbname\n";
+            print "5. PID directory:  $piddir\n";
+        }
 
         ## If in batch mode, we accept everything right away and move on
         last GOOEY if $bcargs->{batch};
@@ -7749,7 +7752,7 @@ sub install {
     $rev =~ s/^\.//;
     $rev =~ s/(\d+)\.\d+/$1/;
 
-    print "Postgres version is: $maj.$min\n";
+    $QUIET or print "Postgres version is: $maj.$min\n";
 
     ## Bare minimum for the install is 8.1
     if ($maj < 8 or (8 == $maj and $min < 1)) {