Fixed unavailable jar command

- prefer unzip, if not detected, use jar Signed-off-by: David Matějček <[email protected]>
eclipse-ee4j · Dec 17, 2024 · d3b7e03 · d3b7e03
1 parent 530a422
commit d3b7e03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java b/...cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
  * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -194,10 +194,11 @@ private void copyToHostsInternal(File zipFile, ArrayList<String> binDirFiles) th
 
             try {
                 logger.info("Installing " + getArchiveName() + " into " + host + ":" + sshInstallDir);
-                String unzipCommand = "cd '" + sshInstallDir + "'; jar -xvf " + getArchiveName();
+                String unzipCommand = "set -x; cd '" + sshInstallDir
+                    + "'; unpack=\"$(command -v unzip)\" || unpack=\"jar -xvf\"; ${unpack} " + getArchiveName();
                 int status = sshLauncher.runCommand(unzipCommand, outStream);
                 if (status != 0) {
-                    logger.info(Strings.get("jar.failed", host, outStream.toString()));
+                    logger.info(Strings.get("unpack.failed", host, outStream.toString()));
                     throw new CommandException("Remote command output: " + outStream.toString());
                 }
                 if (logger.isLoggable(Level.FINER)) {
@@ -206,7 +207,7 @@ private void copyToHostsInternal(File zipFile, ArrayList<String> binDirFiles) th
                 }
             }
             catch (IOException ioe) {
-                logger.info(Strings.get("jar.failed", host, outStream.toString()));
+                logger.info(Strings.get("unpack.failed", host, outStream.toString()));
                 throw new IOException(ioe);
             }
 

diff --git a/...us/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties b/...us/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties
@@ -153,7 +153,7 @@ PasswordAuthFailure=Failed to authenticate using the aliased password stored in
 #installNode
 mkdir.failed=Could not create the directory {0} on host {1}
 cannot.copy.zip.file=Could not copy zip file {0} to host {1}
-jar.failed=jar command failed while installing glassfish on host {0}. Command output {1}
+unpack.failed=Failed unpacking glassfish zip file on host {0}. Command output:\n{1}
 fix.permissions.failed=Could not set permissions on commands in bin directory on host {0} for glassfish installation {1}
 glassfish.install.check.failed=Problem encountered while checking if installation already exists on remote host.