Skip to content

Commit

Permalink
Merge pull request #4730 from ep9io/pr/4252-incorrect-tooltip-position
Browse files Browse the repository at this point in the history 
Added defensive quoting to XDG_SESSION_TYPE #4252
  • Loading branch information
@hansva
hansva authored Dec 24, 2024
2 parents 6314cbb + e2acd14 commit 19cf0aa
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 55 deletions.
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-conf.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-encrypt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
26 changes: 13 additions & 13 deletions assemblies/static/src/main/resources/hop-gui.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [[ $XDG_SESSION_TYPE == "wayland" ]]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-import.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-search.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down
20 changes: 13 additions & 7 deletions assemblies/static/src/main/resources/hop-server.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ HOP_OPTIONS="${HOP_OPTIONS} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --

case $(uname -s) in
Linux)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
# Workaround for https://github.com/apache/hop/issues/4252
# Related to https://github.com/eclipse-platform/eclipse.platform.swt/issues/639
# And to some extent also https://github.com/eclipse-platform/eclipse.platform.swt/issues/790
if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
export GDK_BACKEND=x11
fi
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if "${_HOP_JAVA}" -XshowSettings:properties -version 2>&1 | grep -q "os.arch = aarch64"; then
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
Expand Down

0 comments on commit 19cf0aa

Please sign in to comment.