From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 88864416E; Tue, 16 Mar 2021 01:09:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 2A0B641B2; Tue, 16 Mar 2021 01:09:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 8AA7B4139; Tue, 16 Mar 2021 01:09:16 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by atuin.qyliss.net (Postfix) with ESMTPS id 5136741A5 for ; Tue, 16 Mar 2021 01:09:13 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 56C525C00C8; Mon, 15 Mar 2021 21:09:12 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 21:09:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=nAdDPn8r1MzwVzIbYobOkg+J01p /dHXR9nnnVI34SuM=; b=piEt/jRUnHahXSM0p7E0oJAh3QN1klfaFmFUA2d4vB6 Kr6/0QQ0QNsJuxyLdsKBNT56057PQcN3tdRABfnmkKWnd3iOzR9mskWS1zYnP1jJ 6zrYw3EJT3dS8JxqcaHX0yZTASjvs0GbVq0DJZzih4rmk0iiFHEvR3WLRpqmDfe8 R+mAJu8JVUrDbDut/tsBsJc+UzJqlGO6BNAd1TUe4mxJ/6lXoFWHVRy49f8FQn9X Uin7C7uzOy87/cSJyyrwUcU++QvadbDk7Y/lEi3rKMepFNNkPcvxmNV6MuY1raFe G6bVfVnIb5iqflQyaHNLI2waoR3O2prWRYe1fuyrIug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=nAdDPn 8r1MzwVzIbYobOkg+J01p/dHXR9nnnVI34SuM=; b=WmUyqrWZPhzajMXy+9wxmn ezs2QtyXzIjfBzFZ13ySx/OLxmflKZEE884SqH8C1s/Pg2qcwAboiZcvCtkWibfR Qi7CiN+yGkRp/1I+s2cvazSQiJ4mFWjc+QfJ2VB3Y38BXTCtiqEBW1nedpchWBMa 9KwiO4GWkD8F8WxzkMKYhVzX9UgvpHXsSQ/tgTRISOzihmTMM/0Er/DTFyH2IIip anI1nPerwtdROAxIiLL555RDc5jW8fy4Ok5d3BULoGOP//09C/3giqaOS6F7AEli 4OKNaSwdkJQ+gg92lM/GbQGF0mBlCB/JidDx6RCsOPEkdfwQYAVkg64ipcI9lGRA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefuddgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtddtredttddvnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeuff egffdtvdffiedttefggfehtdfgudfhfffgteefgfdugeegveffieffudduvdenucfkphep keegrddukeegrddvfedvrddukedtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from eve.qyliss.net (p54b8e8b4.dip0.t-ipconnect.de [84.184.232.180]) by mail.messagingengine.com (Postfix) with ESMTPA id 2B8141080064; Mon, 15 Mar 2021 21:09:11 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 329E3F27; Tue, 16 Mar 2021 01:09:10 +0000 (UTC) Date: Tue, 16 Mar 2021 01:09:10 +0000 From: Alyssa Ross To: Cole Helbling Subject: [PATCH nixpkgs v2] spectrumPackages.spectrum-vm: fix without Wayland Message-ID: <20210316010910.ryhee36zgtoahdok@eve.qyliss.net> References: <20200825164808.8707-1-hi@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yk2aoeo7xtg7ccmf" Content-Disposition: inline In-Reply-To: Message-ID-Hash: O66BGSZIZMTCLABBG5OT5Q6POZY2SCCA X-Message-ID-Hash: O66BGSZIZMTCLABBG5OT5Q6POZY2SCCA X-MailFrom: qyliss@eve.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: --yk2aoeo7xtg7ccmf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --- 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 --yk2aoeo7xtg7ccmf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmBQBTMACgkQ+dvtSFmy ccBRYg//cnYDwDOixouFGkKFfvHW/17+4+UmbewwFfhTR1Oc1myhuOPBzeHMAct2 +8OEBSqREq+u6PCLAwQIXs0NQ1wnv7Z9lr8zr/mZUmV9J4T1jCqUyGDxAv/HjhTf 9XbrgCY695GQyjjU6B8DXVH+EvZqU88S8ureCe+XYf+ETIlC9DCagIMvppXalrTZ PO+m0vulYGsq99Jm0da9UBb/d16QvQddsGVpopYphQg6JqXzXROEgQ4DBPtIoT0t 8QJDsbRUdXXqL+6mFevIx7nsfTUQm5tau2KGXV/NlC8a3BaG8uHxnDXxMr7mR0zu veHwnzp5lxfEg0AziIRO7la2v/jWT5sBREyeouBEoQ23X4sv9vIRLaI8jRuhpgz+ snpoF8wYSlLcaxJ/YaeHtR/WTdJbupkSYIwc30W+msfceKqtgmgTHhBCiQTRCf50 AztuPrckKo4xuQSSbL6tZYqL8bcmLbfsd8FwPJAUjwwmW+TCJ2iRpvuLYDPirQTw Gzt5Rvac6dq5DzHWtsywCsyXc6kAdG1ggv8uhaPRhQbWCa+bQZkCYSRqmhPh1WCt ILCy/0eTWDfG+VlqYOF+lcWI/PoEGIiqVjytDwgGwiXgJ98z2spLWN8GtxdSBBTp bdMdgrkympS9TP1MuTsTNDoMolAUfwPRA5FpqNm4Zj/YL2LSG+c= =Vtdp -----END PGP SIGNATURE----- --yk2aoeo7xtg7ccmf--