[java-identity-provider] branch main updated: Fix a couple if installer usabilities nits

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=bcf8f26c628983d540acdbee45cf9fae7dc78ee3

The following commit(s) were added to refs/heads/main by this push:
       new  bcf8f26c6 Fix a couple if installer usabilities nits
bcf8f26c6 is described below

commit bcf8f26c628983d540acdbee45cf9fae7dc78ee3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Aug 25 15:18:11 2021 +0100

    Fix a couple if installer usabilities nits
    
    1) Mention -- help if nothing specified.
    2) Terminate the downloading '....' with a newline.
---
 .../idp/installer/ProgressReportingOutputStream.java         | 12 ++++++++++++
 .../idp/installer/plugin/impl/PluginInstallerArguments.java  |  3 +--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ProgressReportingOutputStream.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ProgressReportingOutputStream.java
index fe08a0ea3..47cb007b8 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ProgressReportingOutputStream.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ProgressReportingOutputStream.java
@@ -32,6 +32,9 @@ public class ProgressReportingOutputStream extends BufferedOutputStream {
     /** How much have we written so far? */
     private int written;
 
+    /** Do we need to output a terminateing newline? */
+    private boolean terminate;
+
     /** Constructor.
      * @param outStream what to bracket.
      */
@@ -55,8 +58,17 @@ public class ProgressReportingOutputStream extends BufferedOutputStream {
             if (System.out != null) {
                 System.out.print('.');
                 System.out.flush();
+                terminate = true;
             }
             written -= PROGRESS_EVERY;
         }
     }
+
+    /** {@inheritDoc} */
+    public void close() throws IOException {
+        super.close();
+        if (terminate) {
+            System.out.println();
+        }
+    }
 }
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
index 8c732faf2..0a9cdcf27 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
@@ -308,8 +308,7 @@ public class PluginInstallerArguments extends AbstractIdPHomeAwareCommandLineArg
             pluginId = contentsList;
             operation = OperationType.LISTCONTENTS;
         } else {
-            getLog().error("Missing qualifier. Options are : -l, -fl, -cl, -i, -u, -r, --license");
-            throw new IllegalArgumentException("Missing qualifier");
+            throw new IllegalArgumentException("Missing qualifier. Try  --help");
         }
     }
     // Checkstyle: CyclomaticComplexity ON

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.