From 05e35369c4ac7966ca7094f0e663078f9ab3531f Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Tue, 13 Aug 2024 09:00:59 +0200 Subject: [PATCH] refactor logic --- apps/updateserver/services/legacy/S3.cfc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/updateserver/services/legacy/S3.cfc b/apps/updateserver/services/legacy/S3.cfc index 353dc08..bbf6d93 100644 --- a/apps/updateserver/services/legacy/S3.cfc +++ b/apps/updateserver/services/legacy/S3.cfc @@ -513,9 +513,8 @@ component { //if (!directoryExists(webDir)) directoryCreate(webDir); // unpack the servers - local.minorVersion=mid(server.lucee.version,1,find(".",server.lucee.version,find(".",minorVersion)+1)-1); - local.srcTomcat = curr & "build/servers/tomcat-" - & (local.minorVersion >= '6.2' ? 'jakarta':'javax' ) & ".zip"; + local.useJakarta=checkVersionGTE( arguments.version, '6.2' ); + local.srcTomcat = curr & "build/servers/tomcat-" & ( useJakarta ? 'jakarta':'javax' ) & ".zip"; zip action="unzip" file=srcTomcat destination=tmpTom; // let's zip it