From 10ef397830d68c764dc24e833682d01c08fe55ab Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 16 Mar 2021 01:02:05 +0000 Subject: spectrumPackages.spectrum-vm: fix without Wayland The surrounding "set +e"/"set -e" was an earlier attempt to fix this, but I mixed -e up with -u. But as Cole points out, it's nicer to use parameter expansion here anyway. Thanks-to: Cole Helbling Message-Id: <20210316010910.ryhee36zgtoahdok@eve.qyliss.net> Reviewed-by: Cole Helbling --- pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in index 4fa0287a805..a72c3896141 100755 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in @@ -55,15 +55,13 @@ do esac done -set +e -if [ -n "$XDG_RUNTIME_DIR" ] +if [ -n "${XDG_RUNTIME_DIR-}" ] then set -- -s "$XDG_RUNTIME_DIR" "$@" - if [ -n "$WAYLAND_DISPLAY" ] + if [ -n "${WAYLAND_DISPLAY-}" ] then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@" fi fi -set -e exec "$crosvm" run \ -p init=/sbin/init \ -- cgit 1.4.1