o Add a noprompt flag.

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 065ccd485c6933a6f8b400ceeeddbd8c5e675095..f600da656b5ad305ab9ce2ebd7a364de868681e7 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -97,10 +97,10 @@ my $keyfiles = {
 # to verify correct args by using anon subs in various places.
 #
 
-my($interactive, $force, $verbose);
+my($prompt, $force, $verbose);
 
 GetOptions(
-            'interactive!' => \$interactive,
+            'prompt!' => \$prompt,
             'force' => \$force,
             'verbose' => \$verbose,
           ) or pod2usage(2);
@@ -226,9 +226,12 @@ print "    <http://www.ncsa.uiuc.edu/Divisions/ACES/GSI/openssh/>\n";
 # give the user a chance to read all of this output
 #
 
-print "\n";
-print "Press <return> to continue... ";
-$trash = <STDIN>;
+if (!$prompt)
+{
+    print "\n";
+    print "Press <return> to continue... ";
+    $trash = <STDIN>;
+}
 
 print "---------------------------------------------------------------------\n";
 print "$myname: Finished configuring package 'gsi_openssh'.\n";
@@ -1120,6 +1123,12 @@ sub query_boolean
     my($query_text, $default) = @_;
     my($nondefault, $foo, $bar);
 
+    if (!$prompt)
+    {
+        print "Prompt suppressed.  Continuing...\n";
+        return "y";
+    }
+
     #
     # Set $nondefault to the boolean opposite of $default.
     #