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/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 8b7d7db HOP-2377: change startup scripts to detect java architecture
new 7b70711 Merge pull request #986 from hansva/master
8b7d7db is described below
commit 8b7d7dbf486586124657ab0a115d45f5206e1f05
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Sat Aug 7 11:35:35 2021 +0200
HOP-2377: change startup scripts to detect java architecture
---
assemblies/static/src/main/resources/hop-conf.sh | 6 +++++-
assemblies/static/src/main/resources/hop-gui.sh | 6 +++++-
assemblies/static/src/main/resources/hop-import.sh | 6 +++++-
assemblies/static/src/main/resources/hop-run.sh | 6 +++++-
assemblies/static/src/main/resources/hop-search.sh | 6 +++++-
assemblies/static/src/main/resources/hop-server.sh | 6 +++++-
assemblies/static/src/main/resources/hop-translator.sh | 8 ++++++--
7 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/assemblies/static/src/main/resources/hop-conf.sh
b/assemblies/static/src/main/resources/hop-conf.sh
index a47dfd3..7ebeeae 100755
--- a/assemblies/static/src/main/resources/hop-conf.sh
+++ b/assemblies/static/src/main/resources/hop-conf.sh
@@ -68,7 +68,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-gui.sh
b/assemblies/static/src/main/resources/hop-gui.sh
index 70f1fe9..40ee016 100755
--- a/assemblies/static/src/main/resources/hop-gui.sh
+++ b/assemblies/static/src/main/resources/hop-gui.sh
@@ -68,7 +68,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-import.sh
b/assemblies/static/src/main/resources/hop-import.sh
index e0931e1..01d6e21 100755
--- a/assemblies/static/src/main/resources/hop-import.sh
+++ b/assemblies/static/src/main/resources/hop-import.sh
@@ -67,7 +67,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-run.sh
b/assemblies/static/src/main/resources/hop-run.sh
index 416f9c1..5abaf6d 100755
--- a/assemblies/static/src/main/resources/hop-run.sh
+++ b/assemblies/static/src/main/resources/hop-run.sh
@@ -68,7 +68,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-search.sh
b/assemblies/static/src/main/resources/hop-search.sh
index 1b735be..fb039f7 100755
--- a/assemblies/static/src/main/resources/hop-search.sh
+++ b/assemblies/static/src/main/resources/hop-search.sh
@@ -68,7 +68,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-server.sh
b/assemblies/static/src/main/resources/hop-server.sh
index 7125618..e6c5e65 100755
--- a/assemblies/static/src/main/resources/hop-server.sh
+++ b/assemblies/static/src/main/resources/hop-server.sh
@@ -68,7 +68,11 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
diff --git a/assemblies/static/src/main/resources/hop-translator.sh
b/assemblies/static/src/main/resources/hop-translator.sh
index 59246d6..0f298a3 100755
--- a/assemblies/static/src/main/resources/hop-translator.sh
+++ b/assemblies/static/src/main/resources/hop-translator.sh
@@ -58,8 +58,12 @@ Linux)
CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
;;
Darwin)
- CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
- OPTIONS="${OPTIONS} -XstartOnFirstThread"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") ==
*"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/osx/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ fi
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
esac
