Permalink
Browse files

PLF-4450 : Allow to display help even if there is a wrong setup

  • Loading branch information...
1 parent a023352 commit 8434cce1bf48b373a30a524b0340a0298e9a6ca8 Arnaud Héritier committed Apr 11, 2013
@@ -33,25 +33,6 @@ if (System.properties['os.name'].toLowerCase().contains('windows')) {
scriptExtension = "bat"
}
-if (!System.getProperty("catalina.home")) {
- println 'error: Erroneous setup, system property catalina.home not defined.'
- System.exit 1
-}
-
-catalinaHome = new File(System.getProperty("catalina.home"))
-
-if (!catalinaHome.isDirectory()) {
- println "error: Erroneous setup, platform home directory (${catalinaHome}) is invalid."
- System.exit 1
-}
-
-extensionsDirectory = new File(catalinaHome, "extensions")
-
-if (!extensionsDirectory.isDirectory()) {
- println "error: Erroneous setup, extensions directory (${extensionsDirectory}) is invalid."
- System.exit 1
-}
-
def cli = new CliBuilder(
posix: false,
stopAtNonOption: true,
@@ -93,6 +74,25 @@ if (options.arguments()) {
System.exit 1
}
+if (!System.getProperty("catalina.home")) {
+ println 'error: Erroneous setup, system property catalina.home not defined.'
+ System.exit 1
+}
+
+catalinaHome = new File(System.getProperty("catalina.home"))
+
+if (!catalinaHome.isDirectory()) {
+ println "error: Erroneous setup, platform home directory (${catalinaHome}) is invalid."
+ System.exit 1
+}
+
+extensionsDirectory = new File(catalinaHome, "extensions")
+
+if (!extensionsDirectory.isDirectory()) {
+ println "error: Erroneous setup, extensions directory (${extensionsDirectory}) is invalid."
+ System.exit 1
+}
+
def listExtensions() {
println ""
println "Available extensions:"

0 comments on commit 8434cce

Please sign in to comment.