[hop] branch master updated: HOP-3995 updated classpath

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new e9acf98c20 HOP-3995 updated classpath
     new 29206df293 Merge pull request #1532 from bamaer/HOP-3995
e9acf98c20 is described below

commit e9acf98c20f48be4b79cb05deb058b206daf1df3
Author: Bart Maertens <bart.maert...@know.bi>
AuthorDate: Tue Jun 14 19:51:55 2022 +0200

    HOP-3995 updated classpath
---
 assemblies/static/src/main/resources/hop-encrypt.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/assemblies/static/src/main/resources/hop-encrypt.sh 
b/assemblies/static/src/main/resources/hop-encrypt.sh
index f177c12c17..4ae8488661 100755
--- a/assemblies/static/src/main/resources/hop-encrypt.sh
+++ b/assemblies/static/src/main/resources/hop-encrypt.sh
@@ -53,10 +53,18 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Encrypt 
-DHOP_PLATFORM_OS="$(
 
 case $(uname -s) in
 Linux)
-  CLASSPATH="lib/*"
+    if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch 
= aarch64"); then
+        CLASSPATH="lib/*:libswt/linux/arm64/*"
+    else
+        CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+    fi
   ;;
 Darwin)
-  CLASSPATH="lib/*"
+  if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = 
aarch64"); then
+      CLASSPATH="lib/*:libswt/osx/arm64/*"
+  else
+      CLASSPATH="lib/*:libswt/osx/x86_64/*"
+  fi
   HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
   ;;
 esac