You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/02/16 15:06:12 UTC
[hop] branch master updated: HOP-3763: change java for commands
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 2d3374c HOP-3763: change java for commands
new 6427cd6 Merge pull request #1372 from hansva/master
2d3374c is described below
commit 2d3374cdd272e24fd69abd6fed418302d64d6cc7
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Feb 16 15:30:48 2022 +0100
HOP-3763: change java for commands
---
assemblies/static/src/main/resources/hop-conf.sh | 4 ++--
assemblies/static/src/main/resources/hop-gui.sh | 4 ++--
assemblies/static/src/main/resources/hop-import.sh | 4 ++--
assemblies/static/src/main/resources/hop-run.sh | 4 ++--
assemblies/static/src/main/resources/hop-search.sh | 4 ++--
assemblies/static/src/main/resources/hop-server.sh | 4 ++--
assemblies/static/src/main/resources/hop-translator.sh | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/assemblies/static/src/main/resources/hop-conf.sh b/assemblies/static/src/main/resources/hop-conf.sh
index 02fde27..4ac8ebc 100755
--- a/assemblies/static/src/main/resources/hop-conf.sh
+++ b/assemblies/static/src/main/resources/hop-conf.sh
@@ -65,14 +65,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Conf -DHOP_AUTO_CREATE_CONFIG
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-gui.sh b/assemblies/static/src/main/resources/hop-gui.sh
index 092e7c6..9d6591a 100755
--- a/assemblies/static/src/main/resources/hop-gui.sh
+++ b/assemblies/static/src/main/resources/hop-gui.sh
@@ -65,14 +65,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=GUI -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-import.sh b/assemblies/static/src/main/resources/hop-import.sh
index 70a1d49..66374e9 100755
--- a/assemblies/static/src/main/resources/hop-import.sh
+++ b/assemblies/static/src/main/resources/hop-import.sh
@@ -64,14 +64,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Import -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-run.sh b/assemblies/static/src/main/resources/hop-run.sh
index f3c3192..bbeca43 100755
--- a/assemblies/static/src/main/resources/hop-run.sh
+++ b/assemblies/static/src/main/resources/hop-run.sh
@@ -65,14 +65,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Run -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-search.sh b/assemblies/static/src/main/resources/hop-search.sh
index 0f3e2da..2cd204a 100755
--- a/assemblies/static/src/main/resources/hop-search.sh
+++ b/assemblies/static/src/main/resources/hop-search.sh
@@ -65,14 +65,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Search -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-server.sh b/assemblies/static/src/main/resources/hop-server.sh
index afa0221..aea22c6 100755
--- a/assemblies/static/src/main/resources/hop-server.sh
+++ b/assemblies/static/src/main/resources/hop-server.sh
@@ -65,14 +65,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Server -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"
diff --git a/assemblies/static/src/main/resources/hop-translator.sh b/assemblies/static/src/main/resources/hop-translator.sh
index b239513..ce3553f 100755
--- a/assemblies/static/src/main/resources/hop-translator.sh
+++ b/assemblies/static/src/main/resources/hop-translator.sh
@@ -55,14 +55,14 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Translator -DHOP_AUTO_CREATE_
case $(uname -s) in
Linux)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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)
- if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
+ 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/*"