Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/stm32cubeide b/stm32cubeide
- index e17bce3..e66dfdd 100755
- --- a/stm32cubeide
- +++ b/stm32cubeide
- @@ -1,5 +1,35 @@
- #!/bin/sh
- -mkdir -p -m 755 $HOME/.java/.systemPrefs
- -export _JAVA_OPTIONS="-Djava.util.prefs.systemRoot=$HOME/.java -Djava.util.prefs.userRoot=$HOME/.java/.userPrefs"
- +# If $XDG_CONFIG_HOME/stm32cubeide.env exists, source it
- +if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/stm32cubeide.env" ]; then
- + # shellcheck source=/dev/null
- + . "${XDG_CONFIG_HOME:-$HOME/.config}/stm32cubeide.env"
- +fi
- +
- +# If _JAVA_OPTIONS exists, try to extract java.util.prefs.systemRoot and java.util.prefs.userRoot from it
- +if [ -n "$_JAVA_OPTIONS" ]; then
- + JAVA_SYSTEM_ROOT=$(echo "$_JAVA_OPTIONS" | sed -n 's/.*-Djava.util.prefs.systemRoot=\([^ ]*\).*//p')
- + JAVA_USER_ROOT=$(echo "$_JAVA_OPTIONS" | sed -n 's/.*-Djava.util.prefs.userRoot=\([^ ]*\).*//p')
- +fi
- +
- +# If values do not exist, fallback to "$XDG_CONFIG_HOME/java"
- +if [ -z "$JAVA_SYSTEM_ROOT" ]; then
- + JAVA_SYSTEM_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/java"
- + if [ -z "$_JAVA_OPTIONS" ]; then
- + _JAVA_OPTIONS="-Djava.util.prefs.systemRoot=$JAVA_SYSTEM_ROOT"
- + else
- + _JAVA_OPTIONS="$_JAVA_OPTIONS -Djava.util.prefs.systemRoot=$JAVA_SYSTEM_ROOT"
- + fi
- +fi
- +if [ -z "$JAVA_USER_ROOT" ]; then
- + JAVA_USER_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/java"
- + _JAVA_OPTIONS="$_JAVA_OPTIONS -Djava.util.prefs.userRoot=$JAVA_USER_ROOT"
- +fi
- +
- +# If $JAVA_SYSTEM_ROOT/.systemPrefs does not exist, create it
- +if [ ! -d "$JAVA_SYSTEM_ROOT/.systemPrefs" ]; then
- + mkdir -p "$JAVA_SYSTEM_ROOT/.systemPrefs"
- + chmod 755 "$JAVA_SYSTEM_ROOT/.systemPrefs"
- +fi
- +export _JAVA_OPTIONS
- /opt/stm32cubeide/stm32cubeide "$@"
- diff --git a/stm32cubeide.desktop b/stm32cubeide.desktop
- index 383bc38..2799772 100644
- --- a/stm32cubeide.desktop
- +++ b/stm32cubeide.desktop
- @@ -3,7 +3,7 @@ Name=STM32CubeIDE
- Comment=Integrated Development Environment for STM32
- GenericName=STM32CubeIDE
- #Exec=env GDK_BACKEND=x11 stm32cubeide %F
- -Exec=env WEBKIT_DISABLE_COMPOSITING_MODE=1 stm32cubeide_wayland %F
- +Exec=env WEBKIT_DISABLE_COMPOSITING_MODE=1 /usr/bin/stm32cubeide_wayland %F
- #Exec=stm32cubeide_wayland %F
- Icon=stm32cubeide
- Path=/opt/stm32cubeide/
- diff --git a/stm32cubeide_wayland b/stm32cubeide_wayland
- index f516eb4..0966867 100755
- --- a/stm32cubeide_wayland
- +++ b/stm32cubeide_wayland
- @@ -1,5 +1,35 @@
- #!/bin/sh
- -mkdir -p -m 755 $HOME/.java/.systemPrefs
- -export _JAVA_OPTIONS="-Djava.util.prefs.systemRoot=$HOME/.java -Djava.util.prefs.userRoot=$HOME/.java/.userPrefs"
- +# If $XDG_CONFIG_HOME/stm32cubeide.env exists, source it
- +if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/stm32cubeide.env" ]; then
- + # shellcheck source=/dev/null
- + . "${XDG_CONFIG_HOME:-$HOME/.config}/stm32cubeide.env"
- +fi
- +
- +# If _JAVA_OPTIONS exists, try to extract java.util.prefs.systemRoot and java.util.prefs.userRoot from it
- +if [ -n "$_JAVA_OPTIONS" ]; then
- + JAVA_SYSTEM_ROOT=$(echo "$_JAVA_OPTIONS" | sed -n 's/.*-Djava.util.prefs.systemRoot=\([^ ]*\).*//p')
- + JAVA_USER_ROOT=$(echo "$_JAVA_OPTIONS" | sed -n 's/.*-Djava.util.prefs.userRoot=\([^ ]*\).*//p')
- +fi
- +
- +# If values do not exist, fallback to "$XDG_CONFIG_HOME/java"
- +if [ -z "$JAVA_SYSTEM_ROOT" ]; then
- + JAVA_SYSTEM_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/java"
- + if [ -z "$_JAVA_OPTIONS" ]; then
- + _JAVA_OPTIONS="-Djava.util.prefs.systemRoot=$JAVA_SYSTEM_ROOT"
- + else
- + _JAVA_OPTIONS="$_JAVA_OPTIONS -Djava.util.prefs.systemRoot=$JAVA_SYSTEM_ROOT"
- + fi
- +fi
- +if [ -z "$JAVA_USER_ROOT" ]; then
- + JAVA_USER_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/java"
- + _JAVA_OPTIONS="$_JAVA_OPTIONS -Djava.util.prefs.userRoot=$JAVA_USER_ROOT"
- +fi
- +
- +# If $JAVA_SYSTEM_ROOT/.systemPrefs does not exist, create it
- +if [ ! -d "$JAVA_SYSTEM_ROOT/.systemPrefs" ]; then
- + mkdir -p "$JAVA_SYSTEM_ROOT/.systemPrefs"
- + chmod 755 "$JAVA_SYSTEM_ROOT/.systemPrefs"
- +fi
- +export _JAVA_OPTIONS
- /opt/stm32cubeide/stm32cubeide_wayland "$@"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement