From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,RCVD_ILLEGAL_IP,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.3 Received: by atuin.qyliss.net (Postfix, from userid 496) id BDEF32A19; Tue, 25 Aug 2020 17:26:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 64F14298E; Tue, 25 Aug 2020 17:26:38 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id AA3EB2A02; Tue, 25 Aug 2020 17:26:37 +0000 (UTC) Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-oln040092009078.outbound.protection.outlook.com [40.92.9.78]) by atuin.qyliss.net (Postfix) with ESMTPS id BCF752A00 for ; Tue, 25 Aug 2020 17:26:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhytvGhzg9mnt5Q3n5qKEeXhF8lEcgmJVDVXjzjL3e539a4uoHvdQzrpUoq5BHoeE7npwKTEP9dPzFoijTd7rI1329ojeFiAWJLkWeeH0peRjgfo76m6nEXNHteM7wHnAKoFFntRXAeLrbpuwbFYUwrcYhJhPJmDgAlUnaIObMPMge9VqTsD4sU01ILxF9Jqap9gUK4wyK4PpLnnt1GlVcIpj3KjIB7mxsGalWiL6W8n7mEC5jD2wtEIozKtTfdwyc6E/P3XdAiSb2R7eWoz0KhadXDV6o9n4MSyi8IJszIb6ZVo/hwEAqCUWXdS2OVWcoIXsKNeraAWSSui3Rip+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CruUZSWbFzEtk1QYx+RH8Z1zpjYfSQIUi9xFcyddmVU=; b=eSna2xJKgsfFal4lZv46cWKdKbcS0PPuLbRBthET/TF1NeKk88yHd4AkwM3HQz+pN23+kxbOUDo46lkBSLTMwJKjQjdEYAOG9ZASTgS6yFFkYTyTcDW4ow0DOTyD6izB6Oxz9dE1vw1CHOe31ajnx3bbOZPaNuAspR8pkayHpmHJAf3OA1IA6x+kLrsGCIO+TvIA1LLrm6cLs7vvEuvSQmgeUD2C3p0jk8VxHWl/IRfLsd0a0Ixlu4LCh92AKDZXbksDTJvJebJtICvWn9ZUpicVFYQmdv0MKMMWeX8nUBWuqDwFQ9Ld0uco3ztDNLbfNM0PmEKp5tTFsMs0IF/Cqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CruUZSWbFzEtk1QYx+RH8Z1zpjYfSQIUi9xFcyddmVU=; b=KG6eJBqVYdZ6zQj5guBK3RRVfY/WJo5+vFKcIDMNuFxMUzKOX6YET0eD6iY7jngtDaBDlrSs9V0wAbZqfB3EfEXSiEF5BqZ4uknq87q3LiNNq8Yv1KjUGzImcyw4DkaTptkQU76J1bmmNltGIBdrF1eHp7g4Q+PJvIB4r96OkAsDvy1L85JpW0EQwC+KDh2NyYyu8Ik1r90gxMzzgjvU6YaQdr3Ezaq9fI1ekwIA8pY4ZWVGDqYM1aFLtonOv1CTgPi+dYPBAPCf08UpO0EQpsaQva53g9FpE2E463moDPNE7nK4XENHl+l81qv8s/It5+4P2HeRLPL7KjyzD4nvuA== Received: from CO1NAM04FT036.eop-NAM04.prod.protection.outlook.com (10.152.90.53) by CO1NAM04HT207.eop-NAM04.prod.protection.outlook.com (10.152.91.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Tue, 25 Aug 2020 17:26:31 +0000 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com (2a01:111:e400:7e4d::4b) by CO1NAM04FT036.mail.protection.outlook.com (2a01:111:e400:7e4d::402) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25 via Frontend Transport; Tue, 25 Aug 2020 17:26:31 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:AA9D6947C9C6C6C51E5CF8DADDB5098E5D76D16BA61007149F17E505B158E447;UpperCasedChecksum:498A2A312AEF603121E849AA182FB36C4CE17BD1A6641DA7F7847F32CDF3C6B9;SizeAsReceived:7368;Count:45 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::61c9:c99c:bd8f:cbd6]) by SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::61c9:c99c:bd8f:cbd6%7]) with mapi id 15.20.3305.026; Tue, 25 Aug 2020 17:26:31 +0000 From: Cole Helbling To: Alyssa Ross , devel@spectrum-os.org Subject: Re: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland In-Reply-To: <20200825164808.8707-1-hi@alyssa.is> References: <20200825164808.8707-1-hi@alyssa.is> Date: Tue, 25 Aug 2020 10:26:30 -0700 Message-ID: Content-Type: text/plain X-ClientProxiedBy: BYAPR21CA0025.namprd21.prod.outlook.com (2603:10b6:a03:114::35) To SJ0PR03MB5581.namprd03.prod.outlook.com (2603:10b6:a03:27b::20) X-Microsoft-Original-Message-ID: <87bliyljqx.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by BYAPR21CA0025.namprd21.prod.outlook.com (2603:10b6:a03:114::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.3 via Frontend Transport; Tue, 25 Aug 2020 17:26:31 +0000 X-Microsoft-Original-Message-ID: <87bliyljqx.fsf@outlook.com> X-TMN: [7MP362CCOw2qiKpXmKGGFn7mwlsM5v0Q] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dad8819b-a024-4c4b-af2a-08d8491c0203 X-MS-TrafficTypeDiagnostic: CO1NAM04HT207: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8eViI7pUzCXu0WIFGGXpXuhlPxcD0IRXINQymDxUErJz+VPnK0gTy0yg450uPuWnpH8O84JdWYuVwvp5HuXTytlyCMqWZOAcCmpuCos5vsUYE7UgP+s6ZFK++Ku28BaKwIA76t+p0N26gUhY+QKqEhapBiZUCrMdFg/obgspGeDJ8hFSO1swXQsx0f7k6cQM3VCUI4ECq+qttcn+QMULXA== X-MS-Exchange-AntiSpam-MessageData: 5gHz+P9LeIjKkcco23jdJjOrwzyvOoBidhbtd5HAk9BaA8QGG+B3C2WNiV7Nqk1eNOs9xiwBBBzlQIY6PVogN1q9SYB3UgnrHCa1Dk+PQkf+JINnVyP5PKZB1pCU1Vv+Q6+AmrKUvK3479eobXrLHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dad8819b-a024-4c4b-af2a-08d8491c0203 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2020 17:26:31.6425 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: CO1NAM04FT036.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM04HT207 Message-ID-Hash: DKTNGZU2IMJMRDLPHDHL7XBTWBQZRF3Z X-Message-ID-Hash: DKTNGZU2IMJMRDLPHDHL7XBTWBQZRF3Z X-MailFrom: cole.e.helbling@outlook.com 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 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: Alyssa Ross 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