diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-03-16 01:02:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-03-16 01:23:43 +0000 |
| commit | 10ef397830d68c764dc24e833682d01c08fe55ab (patch) | |
| tree | d91e92f9ab1fe7c82e3e81a9c97cdcaa832006f6 | |
| parent | d85408e1193933f36d2d7925214719ab09fd0449 (diff) | |
| download | nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar.gz nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar.bz2 nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar.lz nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar.xz nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.tar.zst nixpkgs-10ef397830d68c764dc24e833682d01c08fe55ab.zip | |
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 <cole.e.helbling@outlook.com> Message-Id: <20210316010910.ryhee36zgtoahdok@eve.qyliss.net> Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
| -rwxr-xr-x | pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 6 |
1 files 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 \ |