From: Cole Helbling <cole.e.helbling@outlook.com>
To: Alyssa Ross <hi@alyssa.is>, devel@spectrum-os.org
Subject: Re: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
Date: Tue, 25 Aug 2020 10:26:30 -0700 [thread overview]
Message-ID: <SJ0PR03MB558127A47E1E235BEA3B7CD6B3570@SJ0PR03MB5581.namprd03.prod.outlook.com> (raw)
In-Reply-To: <20200825164808.8707-1-hi@alyssa.is>
Alyssa Ross <hi@alyssa.is> writes:
> This errored because of the undefined XDG_RUNTIME_DIR or
> WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around
> this part, but it turns out I should have disabled -u instead.
> ---
> pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 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..8d95c178689 100755
> --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in
> +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in
> @@ -55,7 +55,7 @@ do
> esac
> done
>
> -set +e
> +set +u
> if [ -n "$XDG_RUNTIME_DIR" ]
Rather than using `set`, I, personally, would change this line to be:
if [ -n "${XDG_RUNTIME_DIR:-}" ]
(as well as the matching check for $WAYLAND_DISPLAY).
Though this is just a matter of opinion, I think it is cleaner than
using `set`s (but only really because I have no idea what all the `set`s
do, without context).
> then
> set -- -s "$XDG_RUNTIME_DIR" "$@"
> @@ -63,7 +63,7 @@ then
> then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@"
> fi
> fi
> -set -e
> +set -u
>
> exec "$crosvm" run \
> -p init=/sbin/init \
> --
> 2.27.0
Cole
next prev parent reply other threads:[~2020-08-25 17:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 16:48 Alyssa Ross
2020-08-25 17:26 ` Cole Helbling [this message]
2021-03-16 1:09 ` [PATCH nixpkgs v2] " Alyssa Ross
2021-03-16 1:15 ` Cole Helbling
2021-03-16 1:25 ` Alyssa Ross
2021-03-15 13:55 [PATCH nixpkgs] " Alyssa Ross
2021-03-15 14:51 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SJ0PR03MB558127A47E1E235BEA3B7CD6B3570@SJ0PR03MB5581.namprd03.prod.outlook.com \
--to=cole.e.helbling@outlook.com \
--cc=devel@spectrum-os.org \
--cc=hi@alyssa.is \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).