From 744c3ccbb624745d8b76a368e3afaab3e5c0936b Mon Sep 17 00:00:00 2001 From: Bob MacCallum Date: Thu, 14 Oct 2021 10:36:07 -0400 Subject: [PATCH] allow PROJECT_NAME to override in all cases --- Model/bin/wb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Model/bin/wb b/Model/bin/wb index a4bcaf582..9328782a4 100644 --- a/Model/bin/wb +++ b/Model/bin/wb @@ -9,10 +9,9 @@ my $gusHome = $ENV{GUS_HOME}; my ($projectName, $webapp) = $baseGus =~ /\/(\w+)\/([\w\.-]+)\/?$/; my $tomcatName = $projectName; -##deal with change Mark made so that Gates and ICEMR sites are run out of the ClinEpiDB tomcat -##requires developer to set a PROJECT_NAME environment variable appropriately ... best in the etc/setenv file that is sourced - -$projectName = ($projectName eq 'ClinEpiDB' && $ENV{PROJECT_NAME}) ? $ENV{PROJECT_NAME} : $projectName; +# allow override of the project name (e.g. PlasmoDB, VectorBase, EuPathDB) that is otherwise +# derived from BASE_GUS +$projectName = $ENV{PROJECT_NAME} // $projectName; unless($baseGus && $projectHome && $gusHome) { die "WHOOPS! Did you forgot to source your setenv file?";