Allow for -help, or any flag option, to be at the end (#591)

rakillen · web-flow · commit 16dc4bf1d96d · 2020-04-08T18:18:03.000-05:00
diff --git a/installer/src/main/bin/createDomain.sh b/installer/src/main/bin/createDomain.sh
@@ -2,7 +2,7 @@
 # *****************************************************************************
 # createDomain.sh
 #
-# Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 #     NAME
@@ -172,7 +172,7 @@ MIN_JDK_VERSION=7
 #
 # Find the args required to determine the WLST script to run
 #
-while [ "$#" -gt "1" ]; do
+while [ "$#" -gt "0" ]; do
     key="$1"
     case $key in
         -help)
diff --git a/installer/src/main/bin/discoverDomain.sh b/installer/src/main/bin/discoverDomain.sh
@@ -199,7 +199,7 @@ SCRIPT_ARGS="$*"
 #
 # Find the args required to determine the WLST script to run
 #
-while [ "$#" -gt "1" ]; do
+while [ "$#" -gt "0" ]; do
     key="$1"
     case $key in
         -help)
diff --git a/installer/src/main/bin/updateDomain.sh b/installer/src/main/bin/updateDomain.sh
@@ -2,7 +2,7 @@
 # *****************************************************************************
 # updateDomain.sh
 #
-# Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 #     NAME
@@ -152,7 +152,7 @@ MIN_JDK_VERSION=7
 # Find the args required to determine the WLST script to run
 #
 
-while [ "$#" -gt "1" ]; do
+while [ "$#" -gt "0" ]; do
     key="$1"
     case $key in
         -help)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# *****************************************************************************`
`3`	`3`	`# createDomain.sh`
`4`	`4`	`#`
`5`		`-# Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.`
	`5`	`+# Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.`
`6`	`6`	`# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`7`	`7`	`#`
`8`	`8`	`# NAME`
`@@ -172,7 +172,7 @@ MIN_JDK_VERSION=7`
`172`	`172`	`#`
`173`	`173`	`# Find the args required to determine the WLST script to run`
`174`	`174`	`#`
`175`		`-while [ "$#" -gt "1" ]; do`
	`175`	`+while [ "$#" -gt "0" ]; do`
`176`	`176`	`key="$1"`
`177`	`177`	`case $key in`
`178`	`178`	`-help)`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ SCRIPT_ARGS="$*"`
`199`	`199`	`#`
`200`	`200`	`# Find the args required to determine the WLST script to run`
`201`	`201`	`#`
`202`		`-while [ "$#" -gt "1" ]; do`
	`202`	`+while [ "$#" -gt "0" ]; do`
`203`	`203`	`key="$1"`
`204`	`204`	`case $key in`
`205`	`205`	`-help)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# *****************************************************************************`
`3`	`3`	`# updateDomain.sh`
`4`	`4`	`#`
`5`		`-# Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.`
	`5`	`+# Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.`
`6`	`6`	`# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`7`	`7`	`#`
`8`	`8`	`# NAME`
`@@ -152,7 +152,7 @@ MIN_JDK_VERSION=7`
`152`	`152`	`# Find the args required to determine the WLST script to run`
`153`	`153`	`#`
`154`	`154`
`155`		`-while [ "$#" -gt "1" ]; do`
	`155`	`+while [ "$#" -gt "0" ]; do`
`156`	`156`	`key="$1"`
`157`	`157`	`case $key in`
`158`	`158`	`-help)`