Repository: nifi-minifi Updated Branches: refs/heads/master e6f6b0665 -> 974c536ca
MINIFI-81 Adding a check for a valid command to the config.sh toolkit script This closes #39. Signed-off-by: Aldrin Piri <ald...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/974c536c Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/974c536c Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/974c536c Branch: refs/heads/master Commit: 974c536cab73351471e770db3cc8885c1e76c2c0 Parents: e6f6b06 Author: Joseph Percivall <joeperciv...@yahoo.com> Authored: Fri Sep 23 11:11:41 2016 -0400 Committer: Aldrin Piri <ald...@apache.org> Committed: Mon Sep 26 11:24:16 2016 -0400 ---------------------------------------------------------------------- .../src/main/resources/config.sh | 17 +++++++++++++++-- .../minifi/toolkit/configuration/ConfigMain.java | 8 -------- 2 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/974c536c/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh index cee8a71..ba29fdc 100755 --- a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh +++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh @@ -119,5 +119,18 @@ run() { } -init "$1" -run "$@" \ No newline at end of file +case "$1" in + transform|validate) + init "$1" + run "$@" + ;; + *) + echo "" + echo "MiNiFi toolkit Usage, valid commands include: {transform|validate}" + echo "transform: Transform template xml into MiNiFi config YAML" + echo " config.sh transform INPUT_FILE OUTPUT_FILE" + echo "validate: Validate config YAML" + echo " config.sh validate INPUT_FILE" + echo "" + ;; +esac \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/974c536c/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java b/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java index e44b5d7..74e1f7f 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java +++ b/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java @@ -85,8 +85,6 @@ public class ConfigMain { public static void printValidateUsage() { System.out.println("Validate Usage:"); System.out.println(); - System.out.print("java "); - System.out.print(ConfigMain.class.getCanonicalName()); System.out.println(" validate INPUT_FILE"); System.out.println(); } @@ -128,8 +126,6 @@ public class ConfigMain { public static void printTransformUsage() { System.out.println("Transform Usage:"); System.out.println(); - System.out.print("java "); - System.out.print(ConfigMain.class.getCanonicalName()); System.out.println(" transform INPUT_FILE OUTPUT_FILE"); System.out.println(); } @@ -313,10 +309,6 @@ public class ConfigMain { public void printUsage() { System.out.println("Usage:"); System.out.println(); - System.out.print("java "); - System.out.print(ConfigMain.class.getCanonicalName()); - System.out.println(" <command> options"); - System.out.println(); System.out.println("Valid commands include:"); commandMap.forEach((s, command) -> System.out.println(s + ": " + command.description)); }
