* [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
@ 2020-08-25 16:48 Alyssa Ross
2020-08-25 17:26 ` Cole Helbling
0 siblings, 1 reply; 5+ messages in thread
From: Alyssa Ross @ 2020-08-25 16:48 UTC (permalink / raw)
To: devel
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" ]
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
2020-08-25 16:48 [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland Alyssa Ross
@ 2020-08-25 17:26 ` Cole Helbling
2021-03-16 1:09 ` [PATCH nixpkgs v2] " Alyssa Ross
0 siblings, 1 reply; 5+ messages in thread
From: Cole Helbling @ 2020-08-25 17:26 UTC (permalink / raw)
To: Alyssa Ross, devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH nixpkgs v2] spectrumPackages.spectrum-vm: fix without Wayland
2020-08-25 17:26 ` Cole Helbling
@ 2021-03-16 1:09 ` Alyssa Ross
2021-03-16 1:15 ` Cole Helbling
0 siblings, 1 reply; 5+ messages in thread
From: Alyssa Ross @ 2021-03-16 1:09 UTC (permalink / raw)
To: Cole Helbling; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 1703 bytes --]
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>
---
On Tue, Aug 25, 2020 at 10:26:30AM -0700, Cole Helbling wrote:
> > -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
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 \
--
2.30.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nixpkgs v2] spectrumPackages.spectrum-vm: fix without Wayland
2021-03-16 1:09 ` [PATCH nixpkgs v2] " Alyssa Ross
@ 2021-03-16 1:15 ` Cole Helbling
2021-03-16 1:25 ` Alyssa Ross
0 siblings, 1 reply; 5+ messages in thread
From: Cole Helbling @ 2021-03-16 1:15 UTC (permalink / raw)
To: Alyssa Ross; +Cc: devel
On Mon Mar 15, 2021 at 6:09 PM PDT, Alyssa Ross wrote:
> 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>
> ---
> pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
LGTM!
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nixpkgs v2] spectrumPackages.spectrum-vm: fix without Wayland
2021-03-16 1:15 ` Cole Helbling
@ 2021-03-16 1:25 ` Alyssa Ross
0 siblings, 0 replies; 5+ messages in thread
From: Alyssa Ross @ 2021-03-16 1:25 UTC (permalink / raw)
To: Cole Helbling; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
On Mon, Mar 15, 2021 at 06:15:37PM -0700, Cole Helbling wrote:
> On Mon Mar 15, 2021 at 6:09 PM PDT, Alyssa Ross wrote:
> > 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>
> > ---
> > pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
>
> LGTM!
>
> Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
Committed as 10ef397830d. Thanks for the review!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-16 1:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 16:48 [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland Alyssa Ross
2020-08-25 17:26 ` Cole Helbling
2021-03-16 1:09 ` [PATCH nixpkgs v2] " Alyssa Ross
2021-03-16 1:15 ` Cole Helbling
2021-03-16 1:25 ` Alyssa Ross
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).