summarylogtreecommitdiffstats
path: root/code-oss.sh
diff options
context:
space:
mode:
authorNevro2023-10-15 08:55:26 +0200
committerNevro2023-10-15 08:55:26 +0200
commiteeeccb4357f2b22e4ed8d3b35f1b92c9a1187027 (patch)
tree756fb64ad166563fec8ee49e7e71945fcc834fda /code-oss.sh
parent704e5deddef0fe3a0973e848e28331f882d115b0 (diff)
downloadaur-eeeccb4357f2b22e4ed8d3b35f1b92c9a1187027.tar.gz
1.83.1
Diffstat (limited to 'code-oss.sh')
-rwxr-xr-xcode-oss.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/code-oss.sh b/code-oss.sh
index 483ea84d7b4d..0412ba4ee5ce 100755
--- a/code-oss.sh
+++ b/code-oss.sh
@@ -20,6 +20,18 @@ in_array() {
}
+is_wayland() {
+
+ [[ "${XDG_SESSION_TYPE}" == "wayland" ]] \
+ && return 0
+
+ [[ -n "${WAYLAND_DISPLAY}" ]] \
+ && return 0
+
+ return 1
+
+}
+
main() {
local -a CODE_USER_FLAGS=()
@@ -30,9 +42,7 @@ main() {
[[ -f "${CODE_CONF_PATH}" ]] \
&& { mapfile -t CODE_USER_FLAGS <<< "$(sed 's/#.*//' ${CODE_CONF_PATH})"; }
- [[ "${XDG_SESSION_TYPE}" == "wayland" ]] && {
-
- unset DISPLAY
+ is_wayland && {
in_array CODE_USER_FLAGS '^--ozone-platform=wayland$' \
|| CODE_USER_FLAGS+=('--ozone-platform=wayland')
@@ -42,7 +52,7 @@ main() {
}
- exec "${CODE_BIN_PATH}" "${CODE_USER_FLAGS[@]}" "$@"
+ exec "${CODE_BIN_PATH}" "$@" "${CODE_USER_FLAGS[@]}"
exit 0