From 2c05cd0cc5b9713ac1dac420b1052cd4d674f13d Mon Sep 17 00:00:00 2001
From: xnbox <xnbox.team@outlook.com>
Date: Sat, 11 Sep 2021 11:22:40 +0300
Subject: [PATCH] Add command line arg --redirect

---
 README.md                                   | 17 +++++++-------
 src/org/tommy/common/utils/CommonUtils.java |  1 -
 src/org/tommy/main/Main.java                | 25 ++++++++++-----------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 3c8e227..cbedf9b 100644
--- a/README.md
+++ b/README.md
@@ -39,19 +39,20 @@ Latest release: <a href="https://github.com/xnbox/tommy/releases/download/v10.0.
 	<li>Embedded WAR / ZIP files and directories</li>
 </ul>
 
-<h2>Command line:</h2>
+<h2>Usage:</h2>
 
 
 ```text
-java -jar tommy.jar [options] [custom arg1] [custom arg2] ...
+java -jar tommy.jar [options] [custom arg]...
 
 Options:
-  --help                   print help message
-  --app <file | dir | URL> run app from ZIP (or WAR) archive, directory or URL
-  --port                   TCP port number, default: 8080
-  --contextPath            context path, default: /
-  --password <password>    provide password (for encrypted ZIP (or WAR) archive)
-
+        --help                  print help message
+        --app <file|dir|URL>    run app from ZIP or WAR archive, directory or URL
+        --port <number>         HTTP TCP port number, default: 8080
+        --port-ssl <number>     HTTPS TCP port number, default: 8443
+        --redirect              redirect HTTP to HTTPS
+        --context-path <string> context path, default: /
+        --password <string>     provide password (for encrypted ZIP (or WAR) archive)
 ```
 
 
diff --git a/src/org/tommy/common/utils/CommonUtils.java b/src/org/tommy/common/utils/CommonUtils.java
index 82bfa3e..f795328 100644
--- a/src/org/tommy/common/utils/CommonUtils.java
+++ b/src/org/tommy/common/utils/CommonUtils.java
@@ -27,7 +27,6 @@ of this software and associated documentation files (the "Software"), to deal
 
 package org.tommy.common.utils;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/org/tommy/main/Main.java b/src/org/tommy/main/Main.java
index f6a4826..547f2dd 100644
--- a/src/org/tommy/main/Main.java
+++ b/src/org/tommy/main/Main.java
@@ -68,7 +68,7 @@ public class Main {
 	private static final String ARGS_PORT_OPTION         = "--port";
 	private static final String ARGS_PORT_SSL_OPTION     = "--port-ssl";
 	private static final String ARGS_REDIRECT_OPTION     = "--redirect";
-	private static final String ARGS_CONTEXT_PATH_OPTION = "--contextPath";
+	private static final String ARGS_CONTEXT_PATH_OPTION = "--context-path";
 
 	public static void main(String[] args) throws Throwable {
 		ManifestUtils.extractBuildDataFromManifest(logger);
@@ -136,24 +136,23 @@ else if (args[i].equals(ARGS_HELP_OPTION))
 			if (help) {
 				StringBuilder sb = new StringBuilder();
 				sb.append("\n");
-				sb.append(" 🟩 Tommy Web Server " + System.getProperty("build.version") + '\n');
+				sb.append(" 🟩 Tommy Web Server " + System.getProperty("build.version") + ". Build: " + System.getProperty("build.timestamp") + '\n');
 				sb.append("\n");
-				sb.append(" Build: " + System.getProperty("build.timestamp") + '\n');
-				sb.append(" OS:    " + SystemProperties.OS_NAME + " (" + SystemProperties.OS_ARCH + ")" + '\n');
-				sb.append(" JVM:   " + SystemProperties.JAVA_JAVA_VM_NAME + " (" + SystemProperties.JAVA_JAVA_VERSION + ")\n");
+				sb.append("  OS: " + SystemProperties.OS_NAME + " (" + SystemProperties.OS_ARCH + ")" + '\n');
+				sb.append(" JVM: " + SystemProperties.JAVA_JAVA_VM_NAME + " (" + SystemProperties.JAVA_JAVA_VERSION + ")\n");
 				sb.append("\n");
 				sb.append(" Usage:\n");
 				sb.append("\n");
-				sb.append(" java -jar tommy.jar [options] [custom arg1] [custom arg2] ...\n");
+				sb.append(" java -jar tommy.jar [options] [custom arg]...\n");
 				sb.append("\n");
 				sb.append(" Options:\n");
-				sb.append("         --help                print help message\n");
-				sb.append("         --app <file|dir|URL>  run app from ZIP (or WAR) archive, directory or URL\n");
-				sb.append("         --port                TCP port number (http), default: 8080\n");
-				sb.append("         --port-ssl            TCP port number (https), default: 8443\n");
-				sb.append("         --redirect            redirect http to https\n");
-				sb.append("         --contextPath         context path, default: /\n");
-				sb.append("         --password <password> provide password (for encrypted ZIP (or WAR) archive)\n");
+				sb.append("         --help                  print help message\n");
+				sb.append("         --app <file|dir|URL>    run app from ZIP or WAR archive, directory or URL\n");
+				sb.append("         --port <number>         HTTP TCP port number, default: 8080\n");
+				sb.append("         --port-ssl <number>     HTTPS TCP port number, default: 8443\n");
+				sb.append("         --redirect              redirect HTTP to HTTPS\n");
+				sb.append("         --context-path <string> context path, default: /\n");
+				sb.append("         --password <string>     provide password for encrypted ZIP or WAR archive\n");
 				System.out.println(sb);
 				System.exit(0);
 			}