You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2022/02/15 14:16:34 UTC
[hop] branch master updated: HOP-3708: update scripts to avoid bash
This is an automated email from the ASF dual-hosted git repository.
mcasters 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 ca4eed2 HOP-3708: update scripts to avoid bash
new fdfc93e Merge pull request #1367 from hansva/master
ca4eed2 is described below
commit ca4eed216feca13977f7e345bc51fce2e93fd0c9
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Feb 15 15:07:23 2022 +0100
HOP-3708: update scripts to avoid bash
---
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 76e0c37..02fde27 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 845b98f..092e7c6 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 0d265d8..70a1d49 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 1480089..f3c3192 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 12eb2cf..0f3e2da 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 b27ca10..afa0221 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 f54303d..b239513 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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(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 "os.arch = ") == *"aarch64"* ]]; then
+ if $(java -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
CLASSPATH="lib/*:libswt/osx/x86_64/*"