refactor logic

lucee · Aug 13, 2024 · 05e3536 · 05e3536
1 parent 53779e8
commit 05e3536
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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