Merge remote-tracking branch 'ArrayBolt3/arraybolt3/trixie'

Author: adrelanos

usr/bin/gsudo-wl

@@ -101,7 +101,7 @@ setup() {
   ## instance opens it but before that other instance locks it.
 
   install --directory --mode=0700 --owner=root --group=root -- "${root_xdg_runtime_dir}"
-  mkdir --parents -- "${root_wayland_lock_dir}"
+  install --directory --mode=0700 --owner=root --group=root -- "${root_wayland_lock_dir}"
   touch -- "${target_wayland_socket}"
   touch -- "${target_wayland_read_lockfile}"
   touch -- "${target_wayland_write_lockfile}"
@@ -127,12 +127,12 @@ teardown() {
 
   if [ -n "${read_lock_fd}" ]; then
     flock --unlock -- "${read_lock_fd}" || true
-  fi
-  if [ -n "${read_lock_fd}" ]; then
-    if flock --nonblock --exclusive -- "${read_lock_fd}" \
-      && flock --nonblock --exclusive -- "${write_lock_fd}" \
-      && umount -- "${target_wayland_socket}"; then
-      safe-rm --force -- "${target_wayland_socket}" || true
+    if [ -n "${write_lock_fd}" ] && [ -n "${target_wayland_socket}" ]; then
+      if flock --nonblock --exclusive -- "${read_lock_fd}" \
+        && flock --nonblock --exclusive -- "${write_lock_fd}" \
+        && umount -- "${target_wayland_socket}"; then
+        safe-rm --force -- "${target_wayland_socket}" || true
+      fi
     fi
   fi
 

usr/bin/gsudo-x

@@ -77,8 +77,8 @@ setup() {
   ## opens it but before that other instance locks it.
 
   install --directory --mode=0700 --owner=root --group=root -- "${root_xdg_runtime_dir}"
-  mkdir --parents -- "${root_x_lock_dir}"
-  ## $DISPLAY is unsafe to trust, as it may contain characters like `../`.
+  install --directory --mode=0700 --owner=root --group=root -- "${root_x_lock_dir}"
+  ## $DISPLAY is unsafe to trust, as it may contain substrings like `../`.
   ## Hash it to get a stable ID we can use in the lockfile name.
   display_hash="$(sha256sum <<< "${DISPLAY}" | cut -d' ' -f1)"
   target_x_lockfile="${root_x_lock_dir}/${display_hash}.lock"
@@ -99,9 +99,11 @@ teardown() {
 
   trap '' EXIT INT TERM
 
-  flock --unlock -- "${x_lock_fd}" || true
-  if flock --nonblock --exclusive -- "${x_lock_fd}"; then
-    sudo --user="${SUDO_USER}" -- xhost '-si:localuser:root' >/dev/null
+  if [ -n "${x_lock_fd}" ]; then
+    flock --unlock -- "${x_lock_fd}" || true
+    if flock --nonblock --exclusive -- "${x_lock_fd}"; then
+      sudo --user="${SUDO_USER}" -- xhost '-si:localuser:root' >/dev/null
+    fi
   fi
 
   exit "${exit_code}"