From 8434cce1bf48b373a30a524b0340a0298e9a6ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Thu, 11 Apr 2013 09:57:14 +0200 Subject: [PATCH] PLF-4450 : Allow to display help even if there is a wrong setup --- .../distributions/ExtensionsManager.groovy | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/plf-shared-tomcat-extensions-manager/src/main/groovy/org/exoplatform/platform/distributions/ExtensionsManager.groovy b/plf-shared-tomcat-extensions-manager/src/main/groovy/org/exoplatform/platform/distributions/ExtensionsManager.groovy index cac915593..248e15dde 100644 --- a/plf-shared-tomcat-extensions-manager/src/main/groovy/org/exoplatform/platform/distributions/ExtensionsManager.groovy +++ b/plf-shared-tomcat-extensions-manager/src/main/groovy/org/exoplatform/platform/distributions/ExtensionsManager.groovy @@ -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:"