From patchwork Sun May 17 17:16:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22151 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D9F2727BBE3; Sun, 17 May 2020 18:18:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 71F8D27BBE1 for ; Sun, 17 May 2020 18:18:29 +0100 (BST) Received: from localhost ([::1]:39074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMvl-0007ad-0o for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:18:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0007Sq-Jv for guix-patches@gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMvN-0004CF-F6 for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMvN-00074I-8T for guix-patches@gnu.org; Sun, 17 May 2020 13:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section. References: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> In-Reply-To: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973588327137 (code B ref 40601); Sun, 17 May 2020 17:18:05 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:03 +0000 Received: from localhost ([127.0.0.1]:44554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvG-00072p-Su for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:03 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:39466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMv6-000716-5y for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:52 -0400 Received: by mail-wm1-f52.google.com with SMTP id w64so7743101wmg.4 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oUYo9T/+Q7VaUq8k85t2wMuKj0cuREfH0mo0SNmNsWs=; b=l4tVdl+oiar6F5DzR9bi8p8tcE8JBybLZzDQAUP7OJQ4yhZwrUiSnQpqM0yoxpM8Pp JP3Lyia9a7mF3PUfKMXDeHOFuK5J7iCSegjBQwrGPTLQ+IJQCctmmQ8NKFLXFbBEquql um84AK6sMM+W6FMzweSXHqCLXS07C3abmzEfTEELRtW5xu/9e0lTYvVIBRcil6WtExmJ wmsjtAZQiYxACDuA+JPHAXNZl2sMasypjvvO9lxmRbN5cL2p7gcN3+TtZNNSDNAHOkSX 8GmFlINaQTPh+9A106Wxi4iww9zHIRzGerBjOEHOgzdrJR57vT/yw6HG4nw2TNMCVuH+ MXkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oUYo9T/+Q7VaUq8k85t2wMuKj0cuREfH0mo0SNmNsWs=; b=oII2XtOc6D3KAB0047QQEj3HfAeP03ChjNBq4C1+TGBdM/1tWzKBt9oSzJDDDj9sEK EgAdHG9nU2+oOsfcQ5O/kKKIQO5vQPH2li6ZydmbFz0IKLYSrtloVS+K53hUXHPVnCo9 6xUR/VcLWzS5SrcUuCWqNuwJLbJ9dhELGhunTmL14Q1JHRHmHrdtRpde72Vcac8wa7gO /8F2KjY4YUgR1rgltgoPlX8beuVjlsytSf3QoibPsOruTU5uOrLcTu/Ys0W6ewkg3jYy DGEruQjidtHOEK1yBf4dIX8NWDppty+aZV1TSHgtl0fyC2ccVngAK3rfH/I0PDuiQLZ3 RhMw== X-Gm-Message-State: AOAM530Y99U6uDS5AaClwC+6oUhbR5mL/VrPjA/5jfl0jBhYR49e39iI +kt4z/tYmVkWtR0hHXb8hpPFm4vq X-Google-Smtp-Source: ABdhPJw3/do73iAcEJYEd2LxdcSHYl1AoKFKlGR67D9LOyESKUwxSs5q/XLoPWu9b+sj4use6zO2nA== X-Received: by 2002:a1c:3585:: with SMTP id c127mr218206wma.34.1589735862201; Sun, 17 May 2020 10:17:42 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:41 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:16:58 +0200 Message-Id: <20200517171725.732-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * nix/local.mk (sysvinit): Add comment. --- nix/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/local.mk b/nix/local.mk index a64bdd2137..412d89ba3d 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -164,6 +164,7 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for sysvinit. sysvinitservicedir = $(sysconfdir)/init.d nodist_sysvinitservice_DATA = etc/init.d/guix-daemon From patchwork Sun May 17 17:17:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22152 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6819927BBE3; Sun, 17 May 2020 18:18:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 23BD827BBE1 for ; Sun, 17 May 2020 18:18:36 +0100 (BST) Received: from localhost ([::1]:39592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMvr-0007pD-O4 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:18:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0007Sp-JW for guix-patches@gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMvL-0004CC-DV for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMvL-00073X-93 for guix-patches@gnu.org; Sun, 17 May 2020 13:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973587527055 (code B ref 40601); Sun, 17 May 2020 17:18:03 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:17:55 +0000 Received: from localhost ([127.0.0.1]:44546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvD-00072F-3c for submit@debbugs.gnu.org; Sun, 17 May 2020 13:17:55 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:38504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMv7-00071A-Qy for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:51 -0400 Received: by mail-wm1-f41.google.com with SMTP id m185so2874861wme.3 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YG1WXT/2/G3bXWxE0kriE/ZG3kP024EQQJnXT1rELdI=; b=vTgjmfvBZYYcFBwE9+oSbbDrR+dtO2L1N4vi0TTNpPD3HxoNuY7NjSvNXjmOq7/EyB XwAUV28/6kJIqsglwkR66J8VbVkf0gX70RwzflorkV2kXRa6hSku3Yk2ZY5W0h0pWJop IBdcsQADFPMtpl9sUCWARfHyqrhTECTwNVqe2pwuK4rQuQSNIY2e19icHZH9AmPlSY+y ehNyCB459YxQT+wYzeDX67quUQ1cttPEHsD1ZdtLbIuZSTLZuJqvJeTviqhv8Z5RaYJ3 YA8wfqYY7FeBRXK7gXoIBX9t54gT8A+KDm3oqM+J/plTBEy8UplBu0zddqy/BX7JUlPR VP/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YG1WXT/2/G3bXWxE0kriE/ZG3kP024EQQJnXT1rELdI=; b=kcCbnJXX42pHRlbCNDrxOpa6RcBdZOMdK1wpO4cOeZyAtGIRU8tXV/ZDjbJol1QtlH toQWbIYM0KOHcGGqeI1jGvq2OC+7smyjZOqdi+fA1FlaJPwGlyWKnejqZfh4Ttk8Xto5 k7QgTD8BJ9MPOJPHhacU+gP/TyNmanWG6J3BNrMHlXIq1IbjsvI5KIvIrBB4M9NSbURL /8ZQUl99yR/fmZU5/KcNPnfUnyGPhhZf3yGnwUpZGERJ4uZOZnx7Q65dRv5ti+Gf3Hkj ooPPvZ10dfiO3thXJ8qQQMCLMadYbIS2dCgy0GSWzzcYMWB6/9fzOEvtTrH7qgdrEpZE B31A== X-Gm-Message-State: AOAM531syHqQWq5q6Py997xncSFvRDDOPeVWhhfsy1SfRwcQYSmHEnGB RWRHCvXDAp5UcUuV8oIMS8Y3ZK8E X-Google-Smtp-Source: ABdhPJxKkYSJHF2dB20E8vjnfIhIY/B8DawCzWyMU3jwdPOlUOcftZAJRYNoCZiHMWq6Uqz0NadRKA== X-Received: by 2002:a1c:6204:: with SMTP id w4mr14947035wmb.55.1589735864036; Sun, 17 May 2020 10:17:44 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:43 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:00 +0200 Message-Id: <20200517171725.732-3-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (chk_init_sys)[systemctl]: Redirect errors to /dev/null. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index dbc038a0ab..4fa9664cf5 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -142,7 +142,7 @@ chk_init_sys() _msg "${INF}init system is: upstart" INIT_SYS="upstart" return 0 - elif [[ $(systemctl) =~ -\.mount ]]; then + elif [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 From patchwork Sun May 17 17:17:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22156 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3673A27BBE3; Sun, 17 May 2020 18:19:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7CDED27BBE1 for ; Sun, 17 May 2020 18:19:24 +0100 (BST) Received: from localhost ([::1]:41334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwe-0000CI-0L for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwN-0008FY-00 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwL-0004Lq-NC for guix-patches@gnu.org; Sun, 17 May 2020 13:19:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwK-00079n-UM for guix-patches@gnu.org; Sun, 17 May 2020 13:19:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973589527301 (code B ref 40601); Sun, 17 May 2020 17:19:04 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:15 +0000 Received: from localhost ([127.0.0.1]:44578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvP-00075S-VV for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:15 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:36983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMv9-00071F-MA for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:55 -0400 Received: by mail-wm1-f41.google.com with SMTP id z72so7778509wmc.2 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5LmrIZmiQZyJ7CLoCVkmbsukOTFLZwrdqX3s7kCsRxU=; b=RKHj8dgrpMXQhF5CMmNruInoUpdObaGy7lktryJUiXoo4Ahwh0sv7U5ghrFmmwaZYT jtzm1SXt9D4Wn604oIqJtSs/Y6GqCEFk5Iag3rUSQhXSSPqXLG49JiG40/TSoVGsWu+w yeuhx2bSrfPt58vO4KDBDOsV8Em4FwjpkDPxe8OcHBtHa8k8pu2f4v9TJe6DcaZQDypz RsbuKO1L/1l5/YZYXB1+g3mnP02jZqexP+zM9GWqoTL3kvXc5aKG3vGdIlMigcQfApqC JZbHbGN+DIrPpz2akw0Q/4PvQZTDRNKTpMtHwFAe9oHfEfk6DT/dkPaJwy31V7JeJZkC ueIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5LmrIZmiQZyJ7CLoCVkmbsukOTFLZwrdqX3s7kCsRxU=; b=mpiDT2Xdl8JCpINkpUTXniNKZQguTAGHGulNf0msFGs2fhcbmKWuI7dXQpzcWhCZL3 iEtO+sDoCmHtjjsMa3Acu/FDg+oTpXnpqF1f+vWZQEv8sWhOsWzQ3dJYQ22GsyOIg6SW NGLlRMcXhk+wqpS39+9dodJcgcTiMgzcBfP+C30ySKK7w1VYitgyXJhx6AtLFhwUaZGv 4H+yy11jVBqwj/TdHJ7VhhcDBeSyAMhX9pAaGZhUpR/yRWUWrrVoshfuivyCmuzhfkyG AqloVOvk5gRase7tMNuqmu0waYPw/o7UwU7hZM3oroJ0FsIcrmjNkhow9nQpN9OeLou3 WKmQ== X-Gm-Message-State: AOAM532mJI+fmuOpGL/nL8uina/Mj/brJTSIiwRN+Ztn0z2f8ApAxg0b nKGfIRmXHLMVeDXbkqcTs/rZLvKs X-Google-Smtp-Source: ABdhPJzGrpfZ9lg1YejuATRhIkHSj10p8uQHVetGjS5VTJMdc9E/ViYdSdmMIFqDcKpTByBd/6oS5Q== X-Received: by 2002:a7b:c21a:: with SMTP id x26mr14722739wmi.82.1589735865917; Sun, 17 May 2020 10:17:45 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:45 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:02 +0200 Message-Id: <20200517171725.732-5-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * .gitignore: Add /etc/runit/run. * etc/guix-install.sh (chk_init_sys): Add case to detect runit. (sys_enable_guix_daemon): Add case to setup guix-daemon within runit. * etc/runit/run.in: New file. * nix/local.mk (etc/runit/run): Add target to generate etc/runit/run from etc/runit/run.in. (nodist_runitservice_DATA): New variable... (CLEANFILES): ... add it here. (runitservicedir): New variable. (EXTRA_DIST): Add etc/runit/run.in. --- .gitignore | 1 + etc/guix-install.sh | 11 +++++++++++ etc/runit/run.in | 15 +++++++++++++++ nix/local.mk | 14 ++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 etc/runit/run.in diff --git a/.gitignore b/.gitignore index fd2cf56098..89a2c89e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ /etc/guix-publish.conf /etc/guix-publish.service /etc/init.d/guix-daemon +/etc/runit/run /guix-daemon /guix/config.scm /libformat.a diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7b9a729570..6eff82c444 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -152,6 +152,10 @@ chk_init_sys() _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" return 0 + elif [[ -d /etc/sv ]]; then + _msg "${INF}init system is: runit" + INIT_SYS="runit" + return 0 else INIT_SYS="NA" _err "${ERR}Init system could not be detected." @@ -364,6 +368,13 @@ sys_enable_guix_daemon() systemctl enable guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; + runit) + { cp -r "${ROOT_HOME}/.config/guix/current/lib/runit/guix-daemon" \ + /etc/sv; + chmod 755 /etc/sv/guix-daemon/run; + ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/; } && + _msg "${PAS}enabled Guix daemon via runit" + ;; sysv-init) { mkdir -p /etc/init.d; cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ diff --git a/etc/runit/run.in b/etc/runit/run.in new file mode 100644 index 0000000000..e57ef597bc --- /dev/null +++ b/etc/runit/run.in @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a "run script" for the runit init system to launch +# 'guix-daemon'. Drop it in /etc/sv/guix-daemon and add a symlink to +# it like the following to have 'guix-daemon' automatically started. +# ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/ + +GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +LC_ALL=en_US.utf8 + +export GUIX_LOCPATH LC_ALL + +exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ + --build-users-group=guixbuild + diff --git a/nix/local.mk b/nix/local.mk index 412d89ba3d..582ff16168 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès # Copyright © 2016 Mathieu Lirzin +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -175,6 +176,17 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service run script for runit. +runitservicedir = $(libdir)/runit/guix-daemon +nodist_runitservice_DATA = etc/runit/run + +etc/runit/run: etc/runit/run.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -189,6 +201,7 @@ etc/guix-%.conf: etc/guix-%.conf.in \ CLEANFILES += \ $(nodist_systemdservice_DATA) \ $(nodist_upstartjob_DATA) \ + $(nodist_runitservice_DATA) \ $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ @@ -198,6 +211,7 @@ EXTRA_DIST += \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ etc/guix-publish.conf.in \ + etc/runit/run.in \ etc/init.d/guix-daemon.in if CAN_RUN_TESTS From patchwork Sun May 17 17:17:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22164 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 751BA27BBE5; Sun, 17 May 2020 18:19:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E524827BBE1 for ; Sun, 17 May 2020 18:19:52 +0100 (BST) Received: from localhost ([::1]:43196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMx6-0000zp-C2 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0007Ss-NQ for guix-patches@gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0004CM-E3 for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMvO-00074l-8L for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973588427160 (code B ref 40601); Sun, 17 May 2020 17:18:06 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:04 +0000 Received: from localhost ([127.0.0.1]:44563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvL-00073e-HU for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:04 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:38513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvA-00071G-I0 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:53 -0400 Received: by mail-wm1-f48.google.com with SMTP id m185so2875061wme.3 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UKovMz2T8MmeYnmWNRGA1O8pU4zP7TixW5aI7Dq8KYU=; b=kNqMPGHE5yXUGCp8RKzh0tYer7ZAntvhohPAhsRjGTMQdyYCbGflpCqbWctxAaSsXM LjgYpjm4C5cKoryyfWKs+LJ0lEM3r4QHCQiX6n+x0ZieM1ErJNt+hC2rRibwRAqylTUK 4HG4oOQ97G/O/uj0+lq6ap8BO2V/qL+z20SyVMPmgVCv/xGA0jcyJzrMYAQfbK2TODb0 ywM4L/P/zVZlVL643Q3Qab/GUpu/8jUvq16m6zIEpw6eYQLqIYzaNCikdoD72/o9inQ9 AK/a80Of0+EIzbThqsub+uAl1uSrKUgqHoBlEFVFpYj1K3wJ9LCjx/1x9bMii4unRKte Dw5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UKovMz2T8MmeYnmWNRGA1O8pU4zP7TixW5aI7Dq8KYU=; b=PQhBhzwnUPxmMQD3cF1aiEg0vWWLEXI7fDsvdUnFpvzjsAZVnPwiWjws6pCR4gs3PL Km5HkloL3EaR1xdY4qMFtQCq7YS61jbDnmif2MqTxP1EX5XlDwyLNrL+yui0w95y2eFJ J9gidlmAFxK88741kxykPXvcr+c4wDlznkO7Tccgqws7F5dlWpa24oslbDmvjwc8TmYL gZtJgC5YV6G+H67aVQBHpWaV0oy24LR90N4DO2uJGGM+HaWkj/CoMcWxmLgJxGc05kgA 4hUeR2c3Arn44lQX0LUhaTYHM65vGqNNJl/KdHbBLld8AkAAXb/cYi5Rs21LKgydR5FP KtNA== X-Gm-Message-State: AOAM532VmvRSNwgA5FKiyL5k13Ebi10lI/dVGFVILIqyesUR6aVu4yh/ hdMjqRwlRAXoXyUIFGhY56i1vTHa X-Google-Smtp-Source: ABdhPJzI1tPmIJWEEtWxPzUY2idnjV9yYYLCwUDJJzpgJIHJlAilcu+t3hGEWT/nWjlMANlWM5fgmA== X-Received: by 2002:a1c:68c2:: with SMTP id d185mr14316823wmc.145.1589735866751; Sun, 17 May 2020 10:17:46 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:46 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:03 +0200 Message-Id: <20200517171725.732-6-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Almost the entire file is indented with spaces, a few tabs slipped in, clean them up. Checked triviality with git diff -b. * etc/guix-install.sh(chk_sys_arch): Replace tabs with spaces. (sys_enable_guix_daemon): Likewise. --- etc/guix-install.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 6eff82c444..078aa4a781 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -180,9 +180,9 @@ chk_sys_arch() aarch64) local arch=aarch64 ;; - armv7l) - local arch=armhf - ;; + armv7l) + local arch=armhf + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 @@ -353,15 +353,15 @@ sys_enable_guix_daemon() /etc/systemd/system/; chmod 664 /etc/systemd/system/guix-daemon.service; - # Work around , present in 1.0.1. - sed -i /etc/systemd/system/guix-daemon.service \ - -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; + # Work around , present in 1.0.1. + sed -i /etc/systemd/system/guix-daemon.service \ + -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; - # Work around , present in 1.0.1. - if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; - then sed -i /etc/systemd/system/guix-daemon.service \ - -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; - fi; + # Work around , present in 1.0.1. + if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; + then sed -i /etc/systemd/system/guix-daemon.service \ + -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; + fi; systemctl daemon-reload && systemctl start guix-daemon && From patchwork Sun May 17 17:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22167 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3B55227BBE4; Sun, 17 May 2020 18:20:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ABD8927BBE1 for ; Sun, 17 May 2020 18:20:00 +0100 (BST) Received: from localhost ([::1]:44012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxE-0001Kb-5w for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMvP-0007St-2q for guix-patches@gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0004Ca-Pr for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMvO-000750-MX for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 07/28] guix-install.sh: Move code in a new function. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973588527189 (code B ref 40601); Sun, 17 May 2020 17:18:06 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:05 +0000 Received: from localhost ([127.0.0.1]:44568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvM-000740-If for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:05 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvB-00071I-ER for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:53 -0400 Received: by mail-wm1-f67.google.com with SMTP id u188so7755990wmu.1 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8gNStNg88YD5Kn8bnefVqMYHDyPrfA+9fsyDVjiARFA=; b=C9YkW51Cskar2pyN6kkgL8rsJpvhVC2xtRP2hyQWy3GndJNemAQZE1uCerb0NXwWw8 kjWzgHElIe4MMWn6vgXD/FsgSCbC2nIyMMQVgjPKZQkFjrVFN4lmMyHaVrzPzYcLDot/ 02UWiCrxkMyaKqoZdasDAHUhtOGxJprrMtF0E2rXaUy+ZKWRkUsSxviuGN+t9JAPBLaF dxHjSFOzYeIZA1fo9Q4/9Jav1kKdjjNab5J/5D0sPy4/IooaQeo6ZPpZ7W+wHcWZ+Kmg EQVA/rqrAR7jIZRUfocm1PmlYsjaFuLT6W3MFws+3sF2rgZlRAJOtJCKsio4JJYa8Dql HXJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8gNStNg88YD5Kn8bnefVqMYHDyPrfA+9fsyDVjiARFA=; b=XgjWeNXPqrK1bqiDSLwR+ItGkJRp8PhSoa5urBWF6hb30+eJq2TFWJVS4eHmc1ggeA IsomMiqPBmqxWaPCQRW9xzxJ0JsQiPDPBHa4bC9VUmRCYuratFqL7oaVL5rf8g12/g8S Zhc3lhAQ+yqSp1g9UcB4CwT11ymuDUkvgOLWb8w7n8VDzwBp8Q9fCq+DJ+dZLmEp7Kzg IGpuUIhqZAkfGzhBi0GNPLSY2t+UXG9uTbqekUUJ50uFsP0aONXbZIL5YU6LsX/NQpR9 clVjbm6Q9gvFeiwktzhApCTBA9MKDAEim0x07fuailBCMlIFBn/zS7dUX7RM+7/v5uS5 /buA== X-Gm-Message-State: AOAM531imJ4yDw7aXfMUqCiNNKeIIAft1TmEJQrV7SEqmp0a0Nqvy7zs l0+0L3tjlVhR6TcyQyquGflqGKRA X-Google-Smtp-Source: ABdhPJx4YtphdmZnHmVF3DiEC4wiDpWUNeMPJEYZ4q9aONx0DU9hitIRXQczdN29TkGRzo/Kzrbg7A== X-Received: by 2002:a1c:2c0b:: with SMTP id s11mr11309060wms.97.1589735867600; Sun, 17 May 2020 10:17:47 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:47 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:04 +0200 Message-Id: <20200517171725.732-7-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (sys_enable_guix_daemon): Move code from here... (sys_make_guix_available): ...to this new function, fixing whitespace... (main): ...and call it here. --- etc/guix-install.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 078aa4a781..225cf532b8 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -330,16 +330,8 @@ sys_create_build_user() sys_enable_guix_daemon() { # Run the daemon, and set it to automatically start on boot. - local info_path - local local_bin - local var_guix - _debug "--- [ $FUNCNAME ] ---" - info_path="/usr/local/share/info" - local_bin="/usr/local/bin" - var_guix="/var/guix/profiles/per-user/root/current-guix" - case "$INIT_SYS" in upstart) { initctl reload-configuration; @@ -391,11 +383,25 @@ sys_enable_guix_daemon() echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" ;; esac +} + +sys_make_guix_available() +{ # add guix into PATH + + local info_path + local local_bin + local var_guix + + _debug "--- [ $FUNCNAME ] ---" + + info_path="/usr/local/share/info" + local_bin="/usr/local/bin" + var_guix="/var/guix/profiles/per-user/root/current-guix" _msg "${INF}making the guix command available to other users" [ -e "$local_bin" ] || mkdir -p "$local_bin" - ln -sf "${var_guix}/bin/guix" "$local_bin" + ln -sf "${var_guix}/bin/guix" "$local_bin" [ -e "$info_path" ] || mkdir -p "$info_path" for i in ${var_guix}/share/info/*; do @@ -505,6 +511,7 @@ main() sys_create_store "${TARBALL}" "${tmp_path}" sys_create_build_user sys_enable_guix_daemon + sys_make_guix_available sys_authorize_build_farms sys_create_init_profile From patchwork Sun May 17 17:17:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22153 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 639E127BBE3; Sun, 17 May 2020 18:19:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3172027BBE1 for ; Sun, 17 May 2020 18:19:15 +0100 (BST) Received: from localhost ([::1]:40672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwU-0008GK-N8 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwK-0008F2-Ul for guix-patches@gnu.org; Sun, 17 May 2020 13:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwK-0004Lm-Lh for guix-patches@gnu.org; Sun, 17 May 2020 13:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwI-00079e-KW for guix-patches@gnu.org; Sun, 17 May 2020 13:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973588827249 (code B ref 40601); Sun, 17 May 2020 17:19:02 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:08 +0000 Received: from localhost ([127.0.0.1]:44576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvP-00075Q-MG for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:35887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvC-00071K-G0 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:54 -0400 Received: by mail-wm1-f51.google.com with SMTP id u188so7756015wmu.1 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0G9W/TT/cnOdqEzDp8jxk8cyBTHuyph0EULP52acRck=; b=EhaRD1Wfk5m4PyEzMS29brIb3OKASeJkJa6ZOPDFrxBTAfkkeCugeQHMC7BHYZvdk3 Ul8T4jH+mkG3BPSbim9Q71rb2AhLuHcAe6OMWnXVfDvVJxma3v5nRBh6q+mMhoOlfIS5 TeMqkLATETF3Qc1LdtQaRE1jeRb2+WChR0Zrb9YwJ7JbOWp5TROwgQezb7BT0Gu+YJSa UqpEy6LdFhTMv/FrGBnND1VakvWSgGebPZ18+rmXL1fn20pBZthUuhjgbwc6uG6nz1p0 0n5Zj5rEN3Mrnt+dhdbJI1sZyJRORHVgxIU1vMcFXXzlMe9o76TxfDPd976HQGoPwL22 W4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0G9W/TT/cnOdqEzDp8jxk8cyBTHuyph0EULP52acRck=; b=HFI7/PQ2lwhizr9duzZLIGjSkZh+A0NfWddqtgEIuGfFv5V559DSTPZohxS2ZsJmp9 dggP88JHNCSf0UE5hqy9txJDRbO1KIH4ZxQFbI91JmRj4wkSDgLaoR+GBVe4eW3wGYGg xO3bDlhXGuHPqM3YAtym5mIGfPyhtD2K3UghmFHwPj9cnLZnFRjZ5DSNLKam3QqW2UBI u/AomEyZ+lqe0F8WAcRixtA92zB0va+ShehXTMC7ht61f51GyK6a1bZKhmNz0/eiPMRw RlVEfU0TASsscMwwTuUWiMzDnRenq/73kNaEFqhCGjH5/zDossC2tOgjMqe/eVNePSBH ZvHw== X-Gm-Message-State: AOAM532hjksU868B1magQ1dTZCSV4c6lavKCfaYEPco3OIDK7r0rJuVu qf1hqWwAoNVj1gGeGsy+Jt35lk9z X-Google-Smtp-Source: ABdhPJyrdwf071sp6gLrimvJKfJUGyUe08h4w1gPgbgu9n47HMQpwJCwK8SphbBNnxu2Pdw0jKSn8A== X-Received: by 2002:a05:600c:2109:: with SMTP id u9mr14469226wml.75.1589735868765; Sun, 17 May 2020 10:17:48 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:48 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:05 +0200 Message-Id: <20200517171725.732-8-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (sys_create_build_user): Use getent instead of id to check presence of users, use bare getent call with output redirection for group check. --- etc/guix-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 225cf532b8..a56e0ec7b2 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -303,7 +303,7 @@ sys_create_build_user() _debug "--- [ $FUNCNAME ] ---" - if [ $(getent group guixbuild) ]; then + if getent group guixbuild >/dev/null 2>&1; then _msg "${INF}group guixbuild exists" else groupadd --system guixbuild @@ -311,7 +311,7 @@ sys_create_build_user() fi for i in $(seq -w 1 10); do - if id "guixbuilder${i}" &>/dev/null; then + if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then _msg "${INF}user is already in the system, reset" usermod -g guixbuild -G guixbuild \ -d /var/empty -s "$(which nologin)" \ From patchwork Sun May 17 17:17:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22157 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6461427BBE3; Sun, 17 May 2020 18:19:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3AB3C27BBE1 for ; Sun, 17 May 2020 18:19:30 +0100 (BST) Received: from localhost ([::1]:41554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwj-0000JC-Hi for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwO-0008H7-Qy for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwN-0004M5-U3 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwN-0007AB-QA for guix-patches@gnu.org; Sun, 17 May 2020 13:19:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 09/28] guix-install.sh: Fix requirements. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591027344 (code B ref 40601); Sun, 17 May 2020 17:19:07 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:30 +0000 Received: from localhost ([127.0.0.1]:44590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvl-00076s-Qq for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:30 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvD-00071S-Al for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:59 -0400 Received: by mail-wr1-f66.google.com with SMTP id w7so9031734wre.13 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CHbortN79gv+m/bvbe15uO/DPrgxWvRSsdF8Un18A4=; b=uF+uPL2ZKRlHoHI1aMOWC2yHdvO3GNVGSOnp+tOSwFe3WeWU0KgjhFjSalha+PvXuA 1gAhfXz3UHiia36DnRmhA7tL5H5QRUID6q67eTOLHLj30MBtBQ0xyEjFadpZ7B4Ol/SY seBvARqPz9yTpkRV01mrzPtxxqfUK0MDNftYaSUGoS+I13cB4ilDHu5wLkd8NBUwldTY boqrRfE2Lxh5Lk1RPCmYP5Mg90G3A+TUcoNewvCFq+gaD36h2yRUc5ljCgRGBOhDAGdx IpjEmcbW6EofmD4BffHnfrwVY5EPmfA/Rzq5NgA+qLa05MJkaB7qPmXN22Xlqg8chPoE ep5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CHbortN79gv+m/bvbe15uO/DPrgxWvRSsdF8Un18A4=; b=nwqZdtWYl+zOjj7/cYEMn/xhkk2mVULQzFW6TIXnt4PG+n2pYmL0tFLZX28YAxT9A+ 0j0UdOb8fTBexaZfK0ySzsoobKXNKnpGvMSv0//JjcCgBQ2Ds/yzijVdr5MeY0+pLwYe mDwpCQ64TW9lUe9kFd9AA1ZFakUcVCO+7IapOUz9AFAHMSlizuRFxSDABju8PprQRPIT N9f4VauVCG7UPRgq6AoZGPncIGlyEmkYp4xE6xABKr8kOrjkVz2p4Fj/vmWtC8GlDBuR LNTwCTs+3SfXMoTTQmozWCLHxgPyRbpN4kC3g+WGplFoluNwSupcm7RPuHgWg5WTjhXA p5xg== X-Gm-Message-State: AOAM531xa5hArCEsf/InbTelYHk/9zFm2lv+RaSHneEsU/zxl7q/UsBi syS4EvrZkL8tSLcBw1wh6BoYEumt X-Google-Smtp-Source: ABdhPJxXhjP6hhQfIbjIVzdXxfZgoVOLnTHvoVYPf/0/7HtKr67NDHtRnNBckBlCoaoNGtcdJz2C7w== X-Received: by 2002:adf:e449:: with SMTP id t9mr15182719wrm.108.1589735869608; Sun, 17 May 2020 10:17:49 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:49 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:06 +0200 Message-Id: <20200517171725.732-9-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches There's no usage of "tr" in the script, whereas tar is used. * etc/guix-install.sh (REQUIRE): Change tr to tar, add ln, remove readlink & dirname. --- etc/guix-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index a56e0ec7b2..19883b89ae 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -33,8 +33,6 @@ set -e [ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } REQUIRE=( - "dirname" - "readlink" "wget" "gpg" "grep" @@ -42,6 +40,7 @@ REQUIRE=( "sed" "sort" "getent" + "ln" "mktemp" "rm" "chmod" @@ -49,7 +48,7 @@ REQUIRE=( "groupadd" "tail" "realpath" - "tr" + "tar" "xz" ) From patchwork Sun May 17 17:17:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22154 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C1A9F27BBE3; Sun, 17 May 2020 18:19:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 78D4527BBE1 for ; Sun, 17 May 2020 18:19:18 +0100 (BST) Received: from localhost ([::1]:40760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwX-0008JX-Qj for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwN-0008Fv-Jb for guix-patches@gnu.org; Sun, 17 May 2020 13:19:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwN-0004M0-3x for guix-patches@gnu.org; Sun, 17 May 2020 13:19:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwL-00079v-VZ for guix-patches@gnu.org; Sun, 17 May 2020 13:19:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973589627308 (code B ref 40601); Sun, 17 May 2020 17:19:05 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:16 +0000 Received: from localhost ([127.0.0.1]:44586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvX-00076I-Lu for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:15 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:40671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvE-00071V-9x for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:56 -0400 Received: by mail-wm1-f43.google.com with SMTP id n18so3495194wmj.5 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ytrjZ5+hfsUd6CTscL8Kv2fvv7PYXRhpj9ozR1tFr04=; b=HssHqkVS1hmOddimWSPF0LXzEoonwULQoXtAQx9uWnEyEM36ay7F3At3OY42149EYF /SxsxB6KvXqwSROvS87en3lHOmnsn4zzQQsXaf618B0BF0wEXIAWOSocUcQU/SxVRtng OxMfJz3CHNU6RwRvXCRfWsCvwC/74vpyja9KxJjTWKlfy2gd2LMxIwiRTbvO7xb4PNUq /7cOOoPT59L7dPmVPF0vhcGlW1ZQts0OPXmaEtDktJO5bnNASzMsVXhmILqDnPvHyInQ 1gLyHnahgqKbGsM/ZG9f/slmQwybqLuovTMgDVIlmAeD7/Ms1cvgr6VC8N+rO08vknHB EefA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ytrjZ5+hfsUd6CTscL8Kv2fvv7PYXRhpj9ozR1tFr04=; b=FKJEV1ty5/UA4l7Mmx4KUcW6PEA/kH6qcOEq0Xcmor9gvW3kHExVA670FgAWIYXHw2 5XSU1YS+vbpLG6m9dhjRYJiRj1zOgh5gmR09hqqS+UamytMOPeeIRrdkXLgWFQ9wwjdC 2yEItMknKllx94+nfao1gPv7VmJr1FJNxn9WyxeU7dfXkDHvqc0zSQpwQZcLa5rs+C1H LNjv/O7ou0jhnacWfu29OJnzTci02FogKzG90KleWtguDLMpsxQmBzAG7zDLiXEmc8zo ACF4cu8425gJbUtpP3cVKFx7DvRPT+UaZ7lPKsROSGWkq8UFWUWGNdHoWEtp3E4ubNHC JZxQ== X-Gm-Message-State: AOAM530aHx+kBtrtXu4LTCRo3iKUFS7Ro+FyxYvBZnF2HtpZdgZmAqVO rhaEqISjH2l4YSrtFcrI0gc6Xlm5 X-Google-Smtp-Source: ABdhPJzVd14f1pAUkMDnjrQpi+CJw6a3W+/Sq0VrFTKkOViVsJEPqpXTF7VQfkSbCf/rHvQjIis+IA== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr14086263wmz.29.1589735870462; Sun, 17 May 2020 10:17:50 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:50 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:07 +0200 Message-Id: <20200517171725.732-10-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (chk_gpg_keyring): Replace () command grouping by {}. --- etc/guix-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 19883b89ae..d2e44e98b2 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -110,11 +110,11 @@ chk_gpg_keyring() # Without --dry-run this command will create a ~/.gnupg owned by root on # systems where gpg has never been used, causing errors and confusion. - gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( - _err "${ERR}Missing OpenPGP public key. Fetch it with this command:" - echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" - exit 1 - ) + gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || { + _err "${ERR}Missing OpenPGP public key. Fetch it with this command:"; + echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -"; + exit 1; + } } chk_term() From patchwork Sun May 17 17:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22166 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B304027BBE3; Sun, 17 May 2020 18:19:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 685A227BBE1 for ; Sun, 17 May 2020 18:19:58 +0100 (BST) Received: from localhost ([::1]:43746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxB-0001EC-VK for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwT-0008Rm-9n for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0004O7-VD for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwS-0007Bm-Ri for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592127446 (code B ref 40601); Sun, 17 May 2020 17:19:12 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:41 +0000 Received: from localhost ([127.0.0.1]:44616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvw-00078W-JJ for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:40 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvE-00071n-Vo for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:11 -0400 Received: by mail-wm1-f67.google.com with SMTP id n5so7786936wmd.0 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QzlDsQONmLEKuCM6RMBYCmP6K47406rcRFrwfkpDmdI=; b=XDW9zAVvreEZN8U3syTDnHOHnN6JmUsRdLX0twZYgScaPpVMwy1WIZW7gsCzzmWref nToc4VeiGXwE9zcxg+aKfB8dwOgx8kw/bZRGKR0JbJkCn6VUs6kCbhvxJOdWGhRq/tRL I78zwDvkqieH6YnhKoxp8oRhNmeaws72CfdWsqKxxJrVamPO1w15M630gMJJCXzpekuX gY4RP0rERGETBGXx9FmZqTDkEbD/NqxV9LbjbQzLdjtzJwNhxdeiOQF0fS9RT1FBB9kJ B3LmE3We9Wg1DFz7Qi1ldHddcw+f+P3f4uXdDReMcawBOdifayPiS/dMG2Blvv2UmST8 S0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QzlDsQONmLEKuCM6RMBYCmP6K47406rcRFrwfkpDmdI=; b=tF0JVJDyrEdFKzQdsYN1ZmM4yGc02YhOaanzRTD+Mbp+PwPaLxCJkNhhQFDqKmolf+ voMJriV4jthw7LzthnC+f/ju8cYSB9ptjbGtyHqII0+mz3Rizw96v9FkXOQ80YPzCPjP jf7B2BuY5f+m6szf6wCnUpzv0vlzYQEGz24rEWWdeRYfhPpt37NoSHsbDWxuyvTg+sTg K5Iz1mOh87YPq23ILkFohYDURlqGJOJcX176AUkzOHQg2MVO9mDhv2QxB+S/M+g6/lps lwUkAeN5SFKoNycHYXitTdUbd6kx+l31+pN7aTN0uVuANfJoJlviCTGKDGjumhs+gXBW /IJQ== X-Gm-Message-State: AOAM531+WtWnV11+83e9LAM/Ho8bN8d6w39RRj2AVZNmaqds4z3R1JlQ trx3LCpp2zehdi/gog1fvcrcnmHI X-Google-Smtp-Source: ABdhPJyMFvKH3oTeCPilPfF9VFOFtkbjm7N9uuYgG2BbofP+MjyrUABy444Udfr61/oemLdlXd7TFA== X-Received: by 2002:a1c:80d0:: with SMTP id b199mr14663359wmd.93.1589735871316; Sun, 17 May 2020 10:17:51 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:50 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:08 +0200 Message-Id: <20200517171725.732-11-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (OPENPGP_SIGNING_KEY_URL): Add new variable. (chk_gpg_keyring): Use it here. --- etc/guix-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d2e44e98b2..043357d9c4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -59,6 +59,7 @@ INF="[ INFO ] " DEBUG=0 GNU_URL="https://ftp.gnu.org/gnu/guix/" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" +OPENPGP_SIGNING_KEY_URL="https://sv.gnu.org/people/viewgpg.php?user_id=15145" # This script needs to know where root's home directory is. However, we # cannot simply use the HOME environment variable, since there is no guarantee @@ -112,7 +113,7 @@ chk_gpg_keyring() # systems where gpg has never been used, causing errors and confusion. gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || { _err "${ERR}Missing OpenPGP public key. Fetch it with this command:"; - echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -"; + echo " wget ${OPENPGP_SIGNING_KEY_URL} -qO - | gpg --import -"; exit 1; } } From patchwork Sun May 17 17:17:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22159 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CB11727BBE3; Sun, 17 May 2020 18:19:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 605F427BBE1 for ; Sun, 17 May 2020 18:19:39 +0100 (BST) Received: from localhost ([::1]:42152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMws-0000Z3-Sf for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwO-0008H0-PF for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwN-0004M3-H1 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwN-0007A3-Dd for guix-patches@gnu.org; Sun, 17 May 2020 13:19:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591027337 (code B ref 40601); Sun, 17 May 2020 17:19:07 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:30 +0000 Received: from localhost ([127.0.0.1]:44588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvY-00076P-0z for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:29 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvG-00071p-1M for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:58 -0400 Received: by mail-wr1-f65.google.com with SMTP id i15so9040165wrx.10 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2izcnBu2ZDWO/kGThBJBoui+0alVNDMev/sMWrvHluo=; b=rpoS9d14/uNkiHssIHLUvxZEe9yr+96zfeABbw6rBxzqOdfVa5z39ObLnj0j4/J2GT ChQCFLWbAq/gzQRzpL7JZPDvUcJHxEl2iieIzV11dqb5JD92MnkbJp+qwhRwIJP8fAFu xQguwJzrlwMXhHxrph15hMc83BFTK7ath9/+dH3QNRMakTNO7CAlj365mBCXeznOBC7R eKROmRQrpq2dr1F4rN+3d9K7Ar+3x07CJoORqd9JX4UD9UrN0lIVETk/A6IKbZwhRorC B9cKLhUVZ+v5Ixawl0+UBTqE6LgwU5sfjQxStehvfR/2sIqBkU88LVGGPOj23XDQSbXQ I8kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2izcnBu2ZDWO/kGThBJBoui+0alVNDMev/sMWrvHluo=; b=SWlAYi8fQu/TyiTziCQtj5GMcGaQwfwg4mSxCW2D1zajecHgoLxRq+KdGTB8U6e4MS IlXf2Sp7Rc9SU8rmjp/vcLp+191QpMVspizvjwLjYlGA/EKDt4U9d06UwzbFcfyCdRRn joJFBKjg9eLYtvTXCqfcJVNywhLff7p5MPF+dGNRc1eGVIDg+Esu4hHoemEQ10f6fGPk nhG+nFC9kvG9lcAECP4hLSqVOyLiYBpxDiYjZ76Ke/KI2jeVAPV6RjTzIZ5nmw1fryIR PrzCwRuA+1NL0bDZWAKfzHKHMh4Q54j22UuahUr9BQFaxd92Ws8r/QoYRu/H/gL6nDp8 s6oA== X-Gm-Message-State: AOAM5305uxndsS2ONQuT0vrDWMSSmY1jghMmLtbYJZvLKHWh3+UBnlA2 TplshbEzM8gP30T56EJctNAtrV7k X-Google-Smtp-Source: ABdhPJz9TUyc+hP2IDG+tzFqnIjparv0j7nKds9p45nuY96kyc1WUTuN+FHiNlRspURNrSEcAqXo5w== X-Received: by 2002:adf:fdd0:: with SMTP id i16mr15156444wrs.389.1589735872187; Sun, 17 May 2020 10:17:52 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:51 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:09 +0200 Message-Id: <20200517171725.732-12-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (REQUIRE): Remove groupadd, add comment. (sys_create_build_user): Add adduser handling. (sys_create_build_group): New function, add addgroup handling... (main): ...call it here. --- etc/guix-install.sh | 57 +++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 043357d9c4..d6966f851a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -32,6 +32,8 @@ set -e [ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } +# groupadd, useradd, usermod, adduser, addgroup are handled in: +# sys_create_build_user & sys_create_build_group functions. REQUIRE=( "wget" "gpg" @@ -45,7 +47,6 @@ REQUIRE=( "rm" "chmod" "uname" - "groupadd" "tail" "realpath" "tar" @@ -298,31 +299,56 @@ sys_create_store() _msg "${PAS}activated root profile at ${ROOT_HOME}/.config/guix/current" } -sys_create_build_user() -{ # Create the group and user accounts for build users. +sys_create_build_group() +{ # Create the group for build users. _debug "--- [ $FUNCNAME ] ---" if getent group guixbuild >/dev/null 2>&1; then - _msg "${INF}group guixbuild exists" - else + _msg "${INF}group guixbuild already exists" + elif command -v groupadd &>/dev/null; then groupadd --system guixbuild _msg "${PAS}group created" + elif command -v addgroup &>/dev/null; then + addgroup -S guixbuild + _msg "${PAS}group created" + else + _err "${ERR}cannot add group for guix build users" + exit 1 fi +} + +sys_create_build_user() +{ # Create the user accounts for build users. + + _debug "--- [ $FUNCNAME ] ---" for i in $(seq -w 1 10); do if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then - _msg "${INF}user is already in the system, reset" - usermod -g guixbuild -G guixbuild \ - -d /var/empty -s "$(which nologin)" \ - -c "Guix build user $i" \ - "guixbuilder${i}"; + if command -v usermod &>/dev/null; then + _msg "${INF}user is already in the system, resetting" + usermod -g guixbuild -G guixbuild \ + -d /var/empty -s "$(which nologin)" \ + -c "Guix build user $i" \ + "guixbuilder${i}" + else + _msg "${ERR}cannot reset user environment, doing nothing" + fi else - useradd -g guixbuild -G guixbuild \ - -d /var/empty -s "$(which nologin)" \ - -c "Guix build user $i" --system \ - "guixbuilder${i}"; - _msg "${PAS}user added " + if command -v useradd &>/dev/null; then + useradd -g guixbuild -G guixbuild \ + -d /var/empty -s "$(which nologin)" \ + -c "Guix build user $i" --system \ + "guixbuilder${i}" + _msg "${PAS}user added " + elif command -v adduser &>/dev/null; then + adduser -G guixbuild -h /var/empty -s "$(which nologin)" \ + -H -S "guixbuilder${i}" + _msg "${PAS}user added " + else + _msg "${ERR}cannot add user: " + exit 1 + fi fi done } @@ -509,6 +535,7 @@ main() TARBALL="$(realpath $1)" fi sys_create_store "${TARBALL}" "${tmp_path}" + sys_create_build_group sys_create_build_user sys_enable_guix_daemon sys_make_guix_available From patchwork Sun May 17 17:17:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22160 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B1A127BBE3; Sun, 17 May 2020 18:19:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5F3FF27BBE1 for ; Sun, 17 May 2020 18:19:41 +0100 (BST) Received: from localhost ([::1]:42348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwu-0000ea-V5 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwO-0008H2-Ps for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwO-0004M8-A1 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwO-0007AK-6Q for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591027351 (code B ref 40601); Sun, 17 May 2020 17:19:08 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:30 +0000 Received: from localhost ([127.0.0.1]:44592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvm-00076z-68 for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:30 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvH-000723-2L for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:59 -0400 Received: by mail-wm1-f65.google.com with SMTP id k12so6989319wmj.3 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nWn9a80F9xiVLG4JDHlaVfqkELF/9LuYMmVWNagKe3s=; b=hoBjQzv5JouYHgfDvVwd+s1Sr44F7vjNGOz0jOL+MJQ1dwqB49DVE7XToxL3gaH6AW pcrP5oRWNFH0AwP/eJmxfOZ3BbxD0t9FU/zlRL4j1ZMMNxjs37m8d3aoXqVF80/IjzjP zDRuuVN45NGcByASeJsZ8xE/uupWVlr/YUEUbm3qF5PPVgFebkffwt/bj/JT0jqQXQjv uB9jZ1zfA64x3m6a+UKIGCADtL+7qKA3xwnYXhfN+llrBDm0oHxO8eDPrg67wesajAK5 RRJdSgPG8XAX7w4H/gyZfdyOR7X/hrE1IHf9rjmkAqnnWIW2lPPI2ujTRqKflVrw20PO o9DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nWn9a80F9xiVLG4JDHlaVfqkELF/9LuYMmVWNagKe3s=; b=QKHiqT3r8RLBa62x7WlO3o/PQygq53I7nSzaFCeCoNZtEvcdgJ2/MoUWBuPvsZSsWp sscr+iR9Bzt5UyF1fM+y57Od9IqGe4fLEUrBypVIRNpg5wBRL/OPU3U7fC5mAE2Udo+f XBPKRQ42dnHB06DZM7akhhiYx0DzLWEVfGg/RW3x8an8YwkGxIV01TKS3q2+JaT5qiun IkjP+2/NJ+SxmGRh5OdIwrRWKW7she0x5VH6+ZSFRBC7sdkxtDnNrYBEMW9puk2T1pKb yPEWF2HuZm+kzBcwgdJAC0pxN2l3nSJVw77PBpLkUC1VFZ6To2dWPLTDWsPHbvKaIgNv 7mwg== X-Gm-Message-State: AOAM532CmFeAQkbj1Y3B20cda5S27Xlk03usrmKyvh7ETCz9WswQoPMQ 2++ucQ6TAmGCdrYpgbmlzK45vvlZ X-Google-Smtp-Source: ABdhPJzLQsqQcwN0htKc+frKeRxIb8uUn/IM7v+b0I6KDzF/nIiVqcw2ZEjvjWRWGAWIs+r2EA+64g== X-Received: by 2002:a05:600c:2c0c:: with SMTP id q12mr14556977wmg.36.1589735873148; Sun, 17 May 2020 10:17:53 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:52 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:10 +0200 Message-Id: <20200517171725.732-13-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The regex is not using pcre-specific syntax. Busybox requires the mktemp template to end with 6 "X". The longer template is harmless for other systems. * etc/guix-install.sh (guix_get_bin_list): Use grep -E instead of pcre. (main): Use template that is accepted by busybox mktemp. --- etc/guix-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d6966f851a..770ecfaf3f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -219,7 +219,7 @@ guix_get_bin_list() | sort -Vu)") latest_ver="$(echo "$bin_ver_ls" \ - | grep -oP "([0-9]{1,2}\.){2}[0-9]{1,2}" \ + | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}" \ | tail -n1)" default_ver="guix-binary-${latest_ver}.${ARCH_OS}" @@ -525,7 +525,7 @@ main() _msg "${INF}system is ${ARCH_OS}" umask 0022 - tmp_path="$(mktemp -t -d guix.XXX)" + tmp_path="$(mktemp -t -d guix.XXXXXX)" if [ -z "$1" ]; then guix_get_bin_list "${GNU_URL}" From patchwork Sun May 17 17:17:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22169 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7DC5527BBE3; Sun, 17 May 2020 18:20:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5F0CE27BBE4 for ; Sun, 17 May 2020 18:20:07 +0100 (BST) Received: from localhost ([::1]:44794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxK-0001aR-Tw for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0008HT-0E for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwO-0004MF-Mg for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwO-0007AR-J4 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible with busybox. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591127358 (code B ref 40601); Sun, 17 May 2020 17:19:08 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:31 +0000 Received: from localhost ([127.0.0.1]:44594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvm-000776-Gk for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:30 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:45473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvI-000729-0R for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:00 -0400 Received: by mail-wr1-f48.google.com with SMTP id v12so9035719wrp.12 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ygICNL6IhoFFWHUOcX9V5HZ4FO6scN2R4lCW8bvbziE=; b=ZUObr8/9Kco5MlwqgtI4JJeVnArneMQnH5rtoF4XZYaSsCco0p85O+ijKJOxUwbjho 8c2ryUgr604dR4q64ZNI7Aey1+MISO+9Hsetc0pfmBZlLDAMH5ty5Id+jQYsUQPYVTDQ pRoVHWhowSFCRLK96ARrQZZyHvLiJ+uZJj1AjqSUgDv7Vo0DOJqOwsW+J/2kjudGfHUc hTgfQyBzpgGuvZFF5x0/AlYDUiWkbF9nDeJ5NjsmnL5zOkb4Q7TprjTHlFmUcoIyWlco cgob0DPGMQjX3fOWoszOUjkrXnfn04lZk1snLnDeuNyxJD6JE6A8hm9/qdg0cATQ1k6z iORw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygICNL6IhoFFWHUOcX9V5HZ4FO6scN2R4lCW8bvbziE=; b=SWdNmOvvrGNfh7luAFd4At4gl+MUAx/2CXEaQX7iOWeYq2mAGfERKpO3KtBYzdU2SK qy17L8AqL0nRmw/PSIFdvGXvvEL/q5UB5fN23VYKO6oA/IXIj9lK+BosRdA7Z2TQqk0m 5v+a+0XHWy/9j0vYmJXsZnR2GUhbqWJL2W1dN9liZJ5x74+OwcRjZPGPJdoAp6mB2R9Z AyJ8/+Vf/MRsDuZNwQU+qiShDkqGyoYuH0pisKW2KL07CcVAuw7S//alinDTVpc6NNDo gj7lYfUj9dO/hSjE1uD37NOUu/Ia+3Bb1RRpcGSWDttS7QKCQ4zolXGyGCEEO5IVbohX toHA== X-Gm-Message-State: AOAM533Jvi0xnbWZ9JXA6miRYNK/ij+IkqYwywRMfa4vJ8uPlKot23fZ qocwgPo5rHkZfY+OkH23XSLFMMp+ X-Google-Smtp-Source: ABdhPJxJLljX6Crsfs7icX4ZgJ87waC4jNdnIJifLvXay58e4sbU/403dA2/snB2gjFQrbyi4lf9xQ== X-Received: by 2002:adf:9264:: with SMTP id 91mr15068684wrj.362.1589735874176; Sun, 17 May 2020 10:17:54 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:53 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:11 +0200 Message-Id: <20200517171725.732-14-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The --warning option is not suported by busybox tar, but it does not emit missing timestamps warnings anyways. * etc/guix-install.sh (sys_create_store): Add --warning tar option only when supported. --- etc/guix-install.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 770ecfaf3f..b5e8416610 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -274,10 +274,13 @@ sys_create_store() _debug "--- [ $FUNCNAME ] ---" - cd "$tmp_path" - tar --warning=no-timestamp \ - --extract \ - --file "$pkg" && + # Do not use the --warning option with busybox tar + TAROPTS=("-C" "${tmp_path}") + if tar c --warning=no-timestamp -f /dev/null /dev/null >&/dev/null; then + TAROPTS+=("--warning=no-timestamp") + fi + + tar x -f "${pkg}" "${TAROPTS[@]}" && _msg "${PAS}unpacked archive" if [[ -e "/var/guix" || -e "/gnu" ]]; then From patchwork Sun May 17 17:17:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22155 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB70227BBE3; Sun, 17 May 2020 18:19:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 31F7527BBE1 for ; Sun, 17 May 2020 18:19:20 +0100 (BST) Received: from localhost ([::1]:40928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwZ-0008OU-Lv for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0008K2-6A for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0004Mq-Rw for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwP-0007An-OS for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591527383 (code B ref 40601); Sun, 17 May 2020 17:19:09 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:35 +0000 Received: from localhost ([127.0.0.1]:44600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvn-00077S-FY for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:34 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:42478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvJ-00072W-01 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:04 -0400 Received: by mail-wr1-f46.google.com with SMTP id s8so9077952wrt.9 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jWLsQQ8zfmfjTduylNRYeuxozIg+Z/8jJJII15/YMRk=; b=EIpOXRpNQVYQPjfG2J+icjtaGPCHQVREgqUT+oxJgWFxA7roNGsEvN6QHG2Jhjd7Y4 OMQJK/lY5doX7PyAX3ZswMgccBJS7KOglFDa21ND6icifkpVR9wte8LTkTHtg5Rgsj5B vQp1YlrzDmaSVrD5fCEUHjAI4EskoCQgJXmr9tEd62TlE2Aiq0pXpK6u3lGzqzGWHw/A H/Kj5P2JdTG2TZX7NbtioCrIjCgn4XBp0bJgPDKBXD6pSP1QCJm6f+haA8ACslOLPHCC WE/Q6hNYYahejrfE9TEEIhD1C+e9/pVeCNI4/l6Z6ohGSawdTTmrXKP8mWyyRGgmU2mA rI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jWLsQQ8zfmfjTduylNRYeuxozIg+Z/8jJJII15/YMRk=; b=rg8FMfVTF8LSKhm/9awq7eyuhHdWwEKKiP+U9sVvKKceOsJX0lLkOLPIA8LA/p8NtQ Knf5GzBNt/WkPMTz7cOLN2SIGaNG23OxYYQk1/z5TyDwygCdfBllhA3A4VxoKVNvfQE4 wkGgvX827vel85nD2AIkgChLNpOrFMWzWgSIzG0rehkrCX1pnY3DclqscomabbfwGj6a VqOLZ+4pLQig2uP5IYzUgG3Fa9bI8bVyOeXoUy8mGPdUPRVSGzUniu2KqT4QqB54tNMW KkZ6rxTe2dY5FWKv+YZYNfsr5QyTJNVzfG1q85zyFGV89TURzdaB8gxXL2pEVikZfVis nXkA== X-Gm-Message-State: AOAM5303gACsh6xd2uPY7VuYNGXoH5w6fP3h7LqnUxJBvioXUoI9Fb2Z PT9eUdQmeAjhfF+DhX0ILj9akRtO X-Google-Smtp-Source: ABdhPJyt6HUe8hZLhwv9kJBTC/RjtDHSoD2L+FtkiwCM9+xnX/5siuj1ZcXgRNH1H7WN3iUa06VaTQ== X-Received: by 2002:a5d:55c5:: with SMTP id i5mr15050518wrw.402.1589735875094; Sun, 17 May 2020 10:17:55 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:54 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:12 +0200 Message-Id: <20200517171725.732-15-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * .gitignore: Add etc/openrc/guix-daemon.in. * etc/guix-install.sh (chk_init_sys): Add case to detect openrc. (sys_enable_guix_daemon): Add case to setup guix-daemon within openrc. * etc/openrc/guix-daemon.in: New file... * nix/local.mk (etc/openrc/guix-daemon): Add target to generate etc/openrc/guix-daemon from etc/openrc/guix-daemon.in. (CLEANFILES): ...add it here. (nodist_openrcservice_DATA): New variable... (openrcservicedir): New variable. (EXTRA_DIST): Add etc/openrc/guix-daemon.in. --- .gitignore | 1 + etc/guix-install.sh | 14 ++++++++++++++ etc/openrc/guix-daemon.in | 14 ++++++++++++++ nix/local.mk | 13 +++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 etc/openrc/guix-daemon.in diff --git a/.gitignore b/.gitignore index 89a2c89e1e..6cd9fb4f17 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ /etc/guix-publish.conf /etc/guix-publish.service /etc/init.d/guix-daemon +/etc/openrc/guix-daemon /etc/runit/run /guix-daemon /guix/config.scm diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b5e8416610..1c22ae95ee 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -149,6 +149,10 @@ chk_init_sys() _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 + elif [[ $(rc -V 2>/dev/null) =~ OpenRC ]]; then + _msg "${INF}init system is: openrc" + INIT_SYS="openrc" + return 0 elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" @@ -396,6 +400,16 @@ sys_enable_guix_daemon() ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/; } && _msg "${PAS}enabled Guix daemon via runit" ;; + openrc) + { mkdir -p /etc/init.d; + cp "${ROOT_HOME}/.config/guix/current/lib/openrc/guix-daemon/guix-daemon" \ + /etc/init.d/guix-daemon; + chmod 755 /etc/init.d/guix-daemon; + + rc-update add guix-daemon default && + rc-service guix-daemon start; } && + _msg "${PAS}enabled Guix daemon via openrc" + ;; sysv-init) { mkdir -p /etc/init.d; cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ diff --git a/etc/openrc/guix-daemon.in b/etc/openrc/guix-daemon.in new file mode 100644 index 0000000000..9641dcfad6 --- /dev/null +++ b/etc/openrc/guix-daemon.in @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +# This is a service script file for the openrc init system to launch +# 'guix-daemon'. Copy it as /etc/init.d/guix-daemon to have 'guix-daemon' +# automatically started. + +command=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon +command_args=--build-users-group=guixbuild +command_background=true +pidfile=/run/guix-daemon.pid + +GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +LC_ALL=en_US.utf8 + diff --git a/nix/local.mk b/nix/local.mk index 582ff16168..9d6f92ebc8 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -187,6 +187,17 @@ etc/runit/run: etc/runit/run.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for openrc. +openrcservicedir = $(libdir)/openrc/guix-daemon +nodist_openrcservice_DATA = etc/openrc/guix-daemon + +etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -202,6 +213,7 @@ CLEANFILES += \ $(nodist_systemdservice_DATA) \ $(nodist_upstartjob_DATA) \ $(nodist_runitservice_DATA) \ + $(nodist_openrcservice_DATA) \ $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ @@ -212,6 +224,7 @@ EXTRA_DIST += \ etc/guix-publish.service.in \ etc/guix-publish.conf.in \ etc/runit/run.in \ + etc/openrc/guix-daemon.in \ etc/init.d/guix-daemon.in if CAN_RUN_TESTS From patchwork Sun May 17 17:17:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22170 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1152C27BBE1; Sun, 17 May 2020 18:20:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B8B627BBE5 for ; Sun, 17 May 2020 18:20:07 +0100 (BST) Received: from localhost ([::1]:44796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxK-0001aQ-UY for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwR-0008NL-BS for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33090) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwR-0004NQ-1k for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwQ-0007BA-Th for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 16/28] non-interactive mode, usage Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591927410 (code B ref 40601); Sun, 17 May 2020 17:19:10 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:39 +0000 Received: from localhost ([127.0.0.1]:44606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvr-00077r-JN for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:39 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:35199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvJ-00072Y-PJ for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:05 -0400 Received: by mail-wr1-f46.google.com with SMTP id j5so9128665wrq.2 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hGqMRxJgM9E7ODx4XyXJlimNdJa81h/EIXwr4O4wHa0=; b=kn4uuBTsWCnlIMVYhMWnG9zUUMBaiyKghqnwoqvvDFciuJY4QRQAIrqt0RZh5+KaNE 519PGfBdwoANpMwOH5/0PYwM7GCNuiz34WCOTYcYC10KX2iketN+36DrlwyKUAAjvUCB fU/FoTTtnNGy6cd8vLKzKzXpa8Sf8RHnTBqp/GULnzN+g4yiSZ+1kGmV0/KkNOudOvF9 W7708Z1yRCqTjgyj38E6GrBj2VVvIj9Lz1JAT9gtOvmWqpFzZhX4Dp5lIUIoGVLLWyTS k5TczXUB3wzuf/Hk013Rc2QxdBehU6C1rW4foSa/Mg/F3aAfGHjYGlJhn/yKLSxBr6RT G1nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hGqMRxJgM9E7ODx4XyXJlimNdJa81h/EIXwr4O4wHa0=; b=Ju79RIkjXyXMqWOyELEYuqYtBq/qnrAb2ITKFH7gXMYjCfDPscXiK9gzS7uHSqIk66 Rt1oqwpST2JcuPn/GKb4k7f08o2o5ePd7Ql+GX0oDaIRFqXsg/QBD9w8zSNMwEtfs5al FnFqlAJG5H3HuQUuX+lIe8ayUPSjkIR+HZdt01fDGlKc2WGaHgTBpsBoVHoncJ/gFKgW IxEE2qGgcc1pbb1HR/SmNEb3QH6dEeT3WkVJGMuonM8oOowq9YHHiQl4xRwaN/OSA8XV eOWHPVFTS24sBzeTmmU3pqL4pzj9CuZ1Cgnj0xZKlDOutqDdnUZQ02PJcAykQBPEsn6N 3+bA== X-Gm-Message-State: AOAM532f6s5oSDe2RMWLkLfq4PM/ZJUoP+x4Df4NAyd6yuFAo51AH0UE NzlzkPviDfAqgnkjoWVqHl9lM4EI X-Google-Smtp-Source: ABdhPJx80GNLLXfvtmPypcGUdxVGp2ge4d4zqISqPOn2p/C/ppCy1Y8zg3/ddYRLRoBkSkIF64iQ+Q== X-Received: by 2002:a5d:40c2:: with SMTP id b2mr14624294wrq.13.1589735875983; Sun, 17 May 2020 10:17:55 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:55 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:13 +0200 Message-Id: <20200517171725.732-16-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 68 +++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 1c22ae95ee..7fb9332e97 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -48,7 +48,6 @@ REQUIRE=( "chmod" "uname" "tail" - "realpath" "tar" "xz" ) @@ -454,17 +453,23 @@ sys_make_guix_available() sys_authorize_build_farms() { # authorize the public key of the build farm - while true; do - read -p "Permit downloading pre-built package binaries from the project's build farm? (yes/no) " yn - case $yn in - [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && - _msg "${PAS}Authorized public key for ci.guix.gnu.org"; - break;; - [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" - break;; - *) _msg "Please answer yes or no."; - esac - done + _AUTHORIZE_BUILD_FARM=1 + if [ "$1" -eq 1 ]; then + while true; do + read -p "Permit downloading pre-built package binaries from the project's build farm? (yes/no) " yn + case "$yn" in + [Yy]*) _AUTHORIZE_BUILD_FARM=1; break;; + [Nn]*) _AUTHORIZE_BUILD_FARM=0; break;; + *) _msg "Please answer yes or no.";; + esac + done + fi + if [ "$_AUTHORIZE_BUILD_FARM" -eq 1 ]; then + guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && + _msg "${PAS}Authorized public key for ci.guix.gnu.org"; + else + _msg "${INF}Skipped authorizing build farm public keys" + fi } sys_create_init_profile() @@ -526,10 +531,41 @@ EOF read -r ANSWER } +# Do not change the tabs in the HERE-DOCUMENT +usage() +{ + cat <<-EOF + $0: Wrong arguments: + $0 [-h|--help] [-n|--non-interactive] [LOCAL_GUIX_BIN_TARBALL] + + -h|--help Show this help + -n|--non-interactive Avoid asing interactive question, run unattended + automatically allow substitutes from guix build farm + + LOCAL_GUIX_BIN_TARBALL Use the given guix binary tarball file instead of + downloading latest released one +EOF +} + +handle_args() +{ + _INTERACTIVE=1 + while [ "$#" -gt 0 ]; do + case "$1" in + -h|--help) usage; exit 0;; + -n|--non-interactive) _INTERACTIVE=0; shift 1;; + + -*) echo "unknown option: $1" >&2; echo; usage; exit 1;; + *) TARBALL="$1"; shift 1;; + esac + done +} + main() { local tmp_path - welcome + handle_args "$@" + [ "${_INTERACTIVE}" -eq 1 ] && welcome _msg "Starting installation ($(date))" @@ -544,19 +580,17 @@ main() umask 0022 tmp_path="$(mktemp -t -d guix.XXXXXX)" - if [ -z "$1" ]; then + if [ -z "${TARBALL}" ]; then guix_get_bin_list "${GNU_URL}" guix_get_bin "${GNU_URL}" "${BIN_VER}" "${tmp_path}" TARBALL="${BIN_VER}.tar.xz" - else - TARBALL="$(realpath $1)" fi sys_create_store "${TARBALL}" "${tmp_path}" sys_create_build_group sys_create_build_user sys_enable_guix_daemon sys_make_guix_available - sys_authorize_build_farms + sys_authorize_build_farms "${_INTERACTIVE}" sys_create_init_profile _msg "${INF}cleaning up ${tmp_path}" From patchwork Sun May 17 17:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22163 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B17F27BBE3; Sun, 17 May 2020 18:19:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6080827BBE1 for ; Sun, 17 May 2020 18:19:52 +0100 (BST) Received: from localhost ([::1]:43146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMx5-0000ye-V1 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0008IP-CO for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0004MV-35 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwO-0007AZ-VO for guix-patches@gnu.org; Sun, 17 May 2020 13:19:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 17/28] fix variable quoting in sys_make_guix_available Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591127366 (code B ref 40601); Sun, 17 May 2020 17:19:08 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:31 +0000 Received: from localhost ([127.0.0.1]:44596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvm-00077D-RZ for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:31 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:44204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvK-00072e-K9 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:03 -0400 Received: by mail-wr1-f45.google.com with SMTP id 50so9042867wrc.11 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YIeeuzeHBqh6HaKfeecEoKvu2DDlvFZVuIVUcHX+Aes=; b=csgZUdSgBm+ednuEXIPicdqKej2xrYcDKBrxU8YhxMG89EMvFE9gpdOj4ISBjRTAb4 oQn37qdmrxVb0pBjcuunOgCpKH66QECRyjUia/BXLVIDSzS2qub6h6iUbqLg6EKBKz37 1/eGkIP5e2A9/gS/aDq9ymKqKEI0WSKUEOZb0R2/sutwof8KzbbO2Y5TxA56GuM6p5cV YVNA4EMTnxkC4/n3M6a9DAxcpNNU/LY9QDPh+zQlxOrUOofcZNMLBPzIfsKAScBV7KIM tyK2am6ouD6EC6dKEPPqdEAD+ED503xWhUFDCSvZcTlP8NkVLj34w44zGzH5Vt4Es9oO /60w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YIeeuzeHBqh6HaKfeecEoKvu2DDlvFZVuIVUcHX+Aes=; b=BToLZVDx+odlrFWKy5Kx+pXnsvtoHZyJkTEFj3Bnvh6Ny6pOwHM5rlsLoaMNLS4Zau QGDtX4oYGki8XUz5obbombkazs2tvCc25zm2SHnAboY8vNAzEtcdVpzfof3AuUG+fmWK 5CixxTpILFxjB1lD3ehhaJYJ7xZqeqJxxUmms3iWjuMtJDcYgaRAk2qGfyUDKAvK/M8h RILXbk1k7DYz/dJGJYHzhTAKnxdboCPJuSGQ6HnXIiPHFmMNgixksEpfQ4ubiJazjzGB SbVNGf4KSbs/YRwnz9mcIJF+knjVrFv1TliXqNfGwjDlb9OFwLEzDT+PSMH1gpB25+IB I8Mw== X-Gm-Message-State: AOAM532B4fZncT0ZZ2Gq2YP9b7nUmaPoLpojhkHuyLiZ6JVzrJTWRfbn OcnrPcQdyN8wnFFhLdr8aRkm5QRy X-Google-Smtp-Source: ABdhPJz7rfC3zH8S7prNiKOiYgEDzfVgZCWVNcAWtiIUPB3lbs9N+Xf8TEKnnQKao6HeH/Q+Hmk5zg== X-Received: by 2002:a5d:4447:: with SMTP id x7mr14616457wrr.424.1589735876845; Sun, 17 May 2020 10:17:56 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:56 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:14 +0200 Message-Id: <20200517171725.732-17-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7fb9332e97..e350fdb052 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -446,7 +446,7 @@ sys_make_guix_available() ln -sf "${var_guix}/bin/guix" "$local_bin" [ -e "$info_path" ] || mkdir -p "$info_path" - for i in ${var_guix}/share/info/*; do + for i in "${var_guix}"/share/info/*; do ln -sf "$i" "$info_path" done } From patchwork Sun May 17 17:17:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22158 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F76427BBE3; Sun, 17 May 2020 18:19:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C8D9927BBE1 for ; Sun, 17 May 2020 18:19:34 +0100 (BST) Received: from localhost ([::1]:41728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwo-0000OC-9c for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0008JS-PO for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0004Mh-F4 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwP-0007Ag-BG for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v" Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591127373 (code B ref 40601); Sun, 17 May 2020 17:19:09 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:31 +0000 Received: from localhost ([127.0.0.1]:44598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvn-00077L-4G for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:31 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvL-00072h-G6 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:04 -0400 Received: by mail-wm1-f65.google.com with SMTP id n18so3495404wmj.5 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b8zuj8hs6ax7Gia8U2Nzy4X9a4KV7XYNtedTtT7AcKo=; b=Pel3bGEOvi4vyg5yvQdwOc+BBpo6G1MAcKiJLNhg6vb80sMi/vJOwwtMS1gZpY1KNI wGURtZNlaCjMmnA7YMMswLL9GJSgjy5C3HZpm2F+8HpLAGXpngqNUmZJAQL8729E8L3W bJ2l5capPam/tZgorPEV3sVmfKPQyBJXinASJarMHjmxVHsoFkIFFyVkldVYtofD/SOs 93a31V6wO1QI2Wt+Zw+EU6MmnOOK+kC1JEMXJXUjcggYY4UZvE3p3eCAfBP/WnesU+r3 nmrbPlnz8vzQLOVghM+Ttk2EfiV70B5WRGBw21N+8uNgJzd14E6teCgORFU2blaYreHz PyNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b8zuj8hs6ax7Gia8U2Nzy4X9a4KV7XYNtedTtT7AcKo=; b=NCAXNdamZkaGyvkaMyZx7eM+RL4J9DE+IbEr3A96PCe8vAbYKxfC+4hAL+v8HcXB9+ lytDwUmO6PogLAM5ctIPGsqy5ikxQuBbjJdyCai7JPKD2RkS76tcE3j29HDNRyAN+0If uDZtcexQrNMM03kxfBHYv/gjZf7r4YgkGGg4VW/frV/3zrlyNXqhjc5yelnCPsrdztYJ gZSTkvfShFw+Zvc0yY51SN+yMtybm1tp133eRCKEzvDJHQSda9xL5G1UACPoBSi6IJbw rLH6Pmo7lK4wUyLGZeoY3pVrsxPjAmc3BTEXRjiLWVyqJx+BCRC3Bm5DUZXkz2e8PPr7 90+Q== X-Gm-Message-State: AOAM533o2YEMw1clp8/4xvNmgPH9a4aS5+AFrdD5hkBkSVfClNyrMmQo AVRPTgHSb2NLgy38k8ISs6aDmesI X-Google-Smtp-Source: ABdhPJz4lQPUDBYeJBrb8Pq+y1MK0eF9LIzL+hCi7OBrzgknyJJ3iA/fvUVW2KvnU+IVqGx1hVrU9Q== X-Received: by 2002:a1c:1b4d:: with SMTP id b74mr14814438wmb.123.1589735877744; Sun, 17 May 2020 10:17:57 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:57 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:15 +0200 Message-Id: <20200517171725.732-18-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index e350fdb052..596ceb5b39 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -38,7 +38,6 @@ REQUIRE=( "wget" "gpg" "grep" - "which" "sed" "sort" "getent" @@ -329,12 +328,13 @@ sys_create_build_user() _debug "--- [ $FUNCNAME ] ---" + NOLOGIN_SHELL="$(command -v nologin)" for i in $(seq -w 1 10); do if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then if command -v usermod &>/dev/null; then _msg "${INF}user is already in the system, resetting" usermod -g guixbuild -G guixbuild \ - -d /var/empty -s "$(which nologin)" \ + -d /var/empty -s "${NOLOGIN_SHELL}" \ -c "Guix build user $i" \ "guixbuilder${i}" else @@ -343,12 +343,12 @@ sys_create_build_user() else if command -v useradd &>/dev/null; then useradd -g guixbuild -G guixbuild \ - -d /var/empty -s "$(which nologin)" \ + -d /var/empty -s "${NOLOGIN_SHELL}" \ -c "Guix build user $i" --system \ "guixbuilder${i}" _msg "${PAS}user added " elif command -v adduser &>/dev/null; then - adduser -G guixbuild -h /var/empty -s "$(which nologin)" \ + adduser -G guixbuild -h /var/empty -s "${NOLOGIN_SHELL}" \ -H -S "guixbuilder${i}" _msg "${PAS}user added " else From patchwork Sun May 17 17:17:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22172 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 61A6427BBE3; Sun, 17 May 2020 18:20:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BA0D027BBE1 for ; Sun, 17 May 2020 18:20:13 +0100 (BST) Received: from localhost ([::1]:45232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxR-0001ky-9z for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0008LC-IH for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0004Mv-8D for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwQ-0007Av-4P for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 19/28] Remove &> and >& bashisms Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591527391 (code B ref 40601); Sun, 17 May 2020 17:19:10 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:35 +0000 Received: from localhost ([127.0.0.1]:44602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvq-00077c-W6 for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:35 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:36994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvM-000730-C7 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:05 -0400 Received: by mail-wm1-f42.google.com with SMTP id z72so7778902wmc.2 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XTQjn/u1Dj4qvtKAyvQ2uzDjIbzG36TwD5X4BAnRlc4=; b=r/GshNepw0+WN5DO2PyU68iqQkapj6kyyyCJLiuNX9VfvUdhZfKnr8voK8I86t9/bw SeFRo8PpBQ2BikOiOs01YHqRWmw7hoA1KrWqLxq5PO4kXgCsOyni9AJ8Sb3/8/iL94Dv mczhiCujtA1DA/2KBMkZ/i5uNCysh0edVhyCJwX7y5HlAuo0kZbzdgaq5kezfE9ICE0+ 98lrHksB+kuLc6Mk5UyWm3mlzAYnyaNW+ARXtnG95ZJNE/QdGh5zEmoMShyst8sU1Z4d hGYIJYnYmVYTdZhzf7rbPI2DblWEniSu6vXohrq3jVM60WnFN+G0DHkXQyzqkbgmktL5 zHVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XTQjn/u1Dj4qvtKAyvQ2uzDjIbzG36TwD5X4BAnRlc4=; b=W6hAsq/YEDlDLayI/UoAZ5JR92GfvIN1WtJSAlgJKNDxnx6nmn21pd08asFLO+Lxky eOCR1HXs9bpWpwUS/K0qTXNsI+CzPT/f++PPkRJv/gFhkMzeeJr1Spe2/1RbhHXCE8h3 pfCnW9FKQEzwOcoRunAtijOAvG0xKV7Dt77AF3Qho7ZCcCcf1mKmYlqXpRImVP476IQl qgvNlYSIzcpF4IEj3ZkBwgN0+9lJ6+7RXnebdaLVwDFo/fBn7LekNGeENz//gRPmq74V ESEigscSUIFJE64DpggQZffGxkYT8EQhahVz9Q28UYIeR2CgAwuI7CzS+FOLvUrVDitL yVVw== X-Gm-Message-State: AOAM530cbH9Pmymy3NRdPHmYp/5ogzU1/+UJ7e+Nvvsd1HMTjyXOeyOK 3Il8EPpf6slKjBsQuDX3Z3JGIny2 X-Google-Smtp-Source: ABdhPJwOcj3xb40jndrEhjINQAgeizLdPgEbAsd0/bJ48+mXtoMINLKobnbmdvSsAMw5bPfIOoK8Pw== X-Received: by 2002:a1c:b141:: with SMTP id a62mr14449589wmf.7.1589735878671; Sun, 17 May 2020 10:17:58 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:58 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:16 +0200 Message-Id: <20200517171725.732-19-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 596ceb5b39..5b82999bc5 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -94,7 +94,7 @@ chk_require() _debug "--- [ $FUNCNAME ] ---" for c in "$@"; do - command -v "$c" &>/dev/null || warn+=("$c") + command -v "$c" >/dev/null 2>&1 || warn+=("$c") done [ "${#warn}" -ne 0 ] && @@ -278,7 +278,7 @@ sys_create_store() # Do not use the --warning option with busybox tar TAROPTS=("-C" "${tmp_path}") - if tar c --warning=no-timestamp -f /dev/null /dev/null >&/dev/null; then + if tar c --warning=no-timestamp -f /dev/null /dev/null >/dev/null 2>&1; then TAROPTS+=("--warning=no-timestamp") fi @@ -311,10 +311,10 @@ sys_create_build_group() if getent group guixbuild >/dev/null 2>&1; then _msg "${INF}group guixbuild already exists" - elif command -v groupadd &>/dev/null; then + elif command -v groupadd >/dev/null 2>&1; then groupadd --system guixbuild _msg "${PAS}group created" - elif command -v addgroup &>/dev/null; then + elif command -v addgroup >/dev/null 2>&1; then addgroup -S guixbuild _msg "${PAS}group created" else @@ -331,7 +331,7 @@ sys_create_build_user() NOLOGIN_SHELL="$(command -v nologin)" for i in $(seq -w 1 10); do if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then - if command -v usermod &>/dev/null; then + if command -v usermod >/dev/null 2>&1; then _msg "${INF}user is already in the system, resetting" usermod -g guixbuild -G guixbuild \ -d /var/empty -s "${NOLOGIN_SHELL}" \ @@ -341,13 +341,13 @@ sys_create_build_user() _msg "${ERR}cannot reset user environment, doing nothing" fi else - if command -v useradd &>/dev/null; then + if command -v useradd >/dev/null 2>&1; then useradd -g guixbuild -G guixbuild \ -d /var/empty -s "${NOLOGIN_SHELL}" \ -c "Guix build user $i" --system \ "guixbuilder${i}" _msg "${PAS}user added " - elif command -v adduser &>/dev/null; then + elif command -v adduser >/dev/null 2>&1; then adduser -G guixbuild -h /var/empty -s "${NOLOGIN_SHELL}" \ -H -S "guixbuilder${i}" _msg "${PAS}user added " From patchwork Sun May 17 17:17:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22168 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 554BB27BBE1; Sun, 17 May 2020 18:20:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C51D927BBE3 for ; Sun, 17 May 2020 18:20:00 +0100 (BST) Received: from localhost ([::1]:44026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxE-0001Kq-9q for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0008MB-Ui for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0004NF-L6 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwQ-0007B2-HO for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591527398 (code B ref 40601); Sun, 17 May 2020 17:19:10 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:35 +0000 Received: from localhost ([127.0.0.1]:44604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvr-00077j-9N for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:35 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:37005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvN-000737-Ax for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:05 -0400 Received: by mail-wm1-f53.google.com with SMTP id z72so7778929wmc.2 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I6rrWMWrhkA14xG8uiQgHxSzvxgpDLgg7Ymy3JSCyEI=; b=vfei2oJJgQ6z86KgcjYiJStywVQqmQTBu/1JwB3BhPKuooPzBq5NAEUUFMUVUrRPrC zTcUOGYOItolutgN+Xu23iiv/7AFoCTwXyOvz5mYzrnkEHcbHXLaatzaCqWS0d6dgk8n MWK1WHkXV7RGEu3+spW29jMwr6WtvGCHfoz/gA3r1yNMW6rqSHAwTSxvbldm+l/FQ5l0 6qRPaNoD4l+cVxQrIHdPwd3YtXOSqLlQrWFOvUBgIbbNjtOn9LEp4TolKp3e8xCv6WGT /dTdLbw4hqcjoyxzyyQ48YIoQz1GxuPtxkPCZVi0XnjttXsofnA2M3vuiNYhfifdaeVP 6yKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I6rrWMWrhkA14xG8uiQgHxSzvxgpDLgg7Ymy3JSCyEI=; b=ScY4PZDwqc8GiaLMP2LBJb6/7/7r4/nxqjfsdb0BsPS9iYgVXhTjvB1FbXjSZZLUFb UOahjlSZ8XPzae2uGAx/PDZ4JtjoNoheJVSf//10IKvfwjLtwSXFIwe/A6/WdDuCQqgw QVHToMJktPMib+Y+365YXCpeikHEH0LPsOaY9fUUnuPclEgNiYnqHSysOy3LfzJxB0Mo +oTv1iqEHpAAdK7/u4OsocbmgeSMgdpiuAQNiOHWi/zEg42EmBmzMn0ssa+dIDU6sr2r SajvL84mNghd7TObK2A7xj2CV2Dh4XuXK2EAyiok+ifmklI5mGMsveELylvwhMCVUNEp gMiA== X-Gm-Message-State: AOAM5335I6tn0FyAQ1LpgF5p3sXajLSGsmVNJosIxbiM205irrXkGe5c tgRmMHcBWPtt8X0A0iUqUbgR4uPn X-Google-Smtp-Source: ABdhPJyJeCF9BsMjj0hlkAgxB+yl674tJu9tIkBz4VrADXi9RGPDggUDiC0S5kytU4rPboxr0Bwplg== X-Received: by 2002:a1c:9d17:: with SMTP id g23mr14360473wme.38.1589735879561; Sun, 17 May 2020 10:17:59 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:59 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:17 +0200 Message-Id: <20200517171725.732-20-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 5b82999bc5..7616f3b82f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -249,7 +249,7 @@ guix_get_bin() wget --help | grep -q '\--show-progress' && \ _PROGRESS_OPT="-q --show-progress" || _PROGRESS_OPT="" - wget $_PROGRESS_OPT -P "$dl_path" "${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig" + wget $_PROGRESS_OPT -P "${dl_path}" "${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig" if [[ "$?" -eq 0 ]]; then _msg "${PAS}download completed." @@ -258,7 +258,7 @@ guix_get_bin() exit 1 fi - pushd $dl_path >/dev/null + pushd "${dl_path}" >/dev/null gpg --verify "${bin_ver}.tar.xz.sig" >/dev/null 2>&1 if [[ "$?" -eq 0 ]]; then _msg "${PAS}Signature is valid." From patchwork Sun May 17 17:17:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22162 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DBF8027BBE3; Sun, 17 May 2020 18:19:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8BE1327BBE1 for ; Sun, 17 May 2020 18:19:49 +0100 (BST) Received: from localhost ([::1]:42926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMx3-0000tF-0c for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwR-0008O4-N6 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwR-0004NX-DH for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwR-0007BH-9v for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 21/28] Remove unused variable Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973591927417 (code B ref 40601); Sun, 17 May 2020 17:19:11 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:39 +0000 Received: from localhost ([127.0.0.1]:44608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvv-000783-7m for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:39 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:38523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvO-00073E-4V for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: by mail-wm1-f41.google.com with SMTP id m185so2875539wme.3 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DTNh6FM9U68VKmP6Y8g9TZ3g85BSg5XzG75Lcjw3CiM=; b=HFPbu+iB7/omrXGbwUWoxbJ54yDQxrYSihKCTQPuL04LfpYWomiWrBhhfkYdrZIvPJ 3qwYru8kizoWTYAnq0Lun8GEcUDD++SThS3T/mtvoaVcjqlridmZ9N/rxo3ulbR1yJOV QFi5/D6jt+uLGPyblNSdISnexi+MOW4K1zdtpk8jZWZPOTODJa6IQWGHu4C+KWr09woT pOEjIcnu+qYjGTxoLqw6WR5DfGFOsO/x8d/eKotkn0ruERo5CdWIKYONgB8606cdi2d1 rxZklyUryHya7dQMZ9PwfcrWrHt18HalkW9qJs1BBtSH1M3pkQH1SHf6gqfU0Y5OXzV/ VnCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DTNh6FM9U68VKmP6Y8g9TZ3g85BSg5XzG75Lcjw3CiM=; b=X0nDhYnUNw5qe9Ub6bLptwvOYEWByAXmkFM+/lR/5Q21EdQ8jcTGznXx3/TxTsd/em JlfMllpjx98/tc43NfkBwGBLslY4Vj9SJ2bwrXLwp9hI19Ugf67c0aC6+F8mgXmJvwBz fjk+oR8HSsb1K7tuLjjTA0/QqBbbP11TjUuj/ISYprcBWzk99zbAe4DR4HbbqVjEc0dw VcUWCjWB0mo+m+LIpNQh3dN0WktqH1bBDBzVYs3cGSZR4hHrx6bx6Hgmltiyn4jXxxTC Nq/14K/ggWFJ5onklfHwaCGK62O+Yd/bijtj2/KJ4/jcfz0fk/t4mEBHkYlmksmIJnhq 0s5g== X-Gm-Message-State: AOAM53157n/rCfJzg/ntf3OuAlRVOP94Wt1gjw38qZ8oYj0GMoQTnhRB 0fDnyeReZp0xQVI4MWqOpzW/DytS X-Google-Smtp-Source: ABdhPJxzLVsv2t35C5yWd174HSbhRHKF65GhHM/nenrOuCKXZlFoEuP6GUt+QOIsD6RWhXVmMAhj4w== X-Received: by 2002:a1c:de05:: with SMTP id v5mr14354446wmg.1.1589735880475; Sun, 17 May 2020 10:18:00 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:00 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:18 +0200 Message-Id: <20200517171725.732-21-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7616f3b82f..078081c08a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -119,16 +119,12 @@ chk_gpg_keyring() chk_term() { # Check for ANSI terminal for color printing. - local ansi_term - if [ -t 2 ]; then if [ "${TERM+set}" = 'set' ]; then case "$TERM" in xterm*|rxvt*|urxvt*|linux*|vt*|eterm*|screen*) - ansi_term=true ;; *) - ansi_term=false ERR="[ FAIL ] " PAS="[ PASS ] " ;; From patchwork Sun May 17 17:17:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22174 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F6B027BBE1; Sun, 17 May 2020 18:20:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7079E27BBE3 for ; Sun, 17 May 2020 18:20:20 +0100 (BST) Received: from localhost ([::1]:45600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxY-0001wN-16 for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0008P7-63 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwR-0004Nf-QH for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwR-0007BO-Mb for guix-patches@gnu.org; Sun, 17 May 2020 13:19:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 22/28] Remove local bashisms Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592027425 (code B ref 40601); Sun, 17 May 2020 17:19:11 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:40 +0000 Received: from localhost ([127.0.0.1]:44610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvv-00078A-IX for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:39 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:52218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvP-00073G-3l for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: by mail-wm1-f43.google.com with SMTP id f134so6997815wmf.1 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+SEZi/2QEkG9kD0HWIabf4tSJMC684gTnEP6nOKmweI=; b=mSviWSh+cdI5PENu7P97JnQqj6Thd6XNMEs7wc0+k0Wf4IJQisDS7HILdcuj2LTY31 UhaygSEXdhf+klYXVF/E6mP6c0uQ9bmSLqV9FepgFPfjuEnps48vYfz+ov99++jcy8+e i45JVcKuSVPlRR/vmFuVxBUNwhDoGwVDRoPQcoQnO6ARQvfK4ZeSpx77UHaYv1Za8Cdr /bMMhtVw8yPHAhqxjYWRL2bSpPYb0aBa8bILhfHCsYnS365FLhwkslPVDNcKTQFzRP/s 6xu4W21X2N/jximmFaTkazlo2CipLCAcmynHNRe13zVvqUVXxhT2U1r6VmpJKcMsL13s TFQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+SEZi/2QEkG9kD0HWIabf4tSJMC684gTnEP6nOKmweI=; b=MCF8eODhK40hJYgBY+54p6R5qA+Ev7q0/IHIh1sCSJTnOoGIyRGFop66isysaeYtxZ SyC+l/TfNQGYfKdr18C8zSY+9/VHtaSoLyVcfeXcorSSoNBJxkykHKgYZ9ErVTyodA0C oDm399Q5tui9aPELDHUPw+s3w2AAFMTczQqFvaEv1KIWbHAvqqWbz+8RSBIETTsakzWD KzpST/kT7chS2oL+XXZjNPWo4OwaIBaVwieWr+xIoOHS5gyFuQHva95R69KUq3rAeaiE 0zwxeKjO7vMUDNuK8HnVz6CnzwSOFZWukHXyx+zMT+nPu3YFd/zwbmXS86Y5YBTXt3gG DCkA== X-Gm-Message-State: AOAM531ygy/6cuZnAck5OnG3ELA1nKfZCjkAwqLQ9Dct4Igd03LVdfo/ 9dB0KkVmPLLDodJHHKeQUMFyulLx X-Google-Smtp-Source: ABdhPJwDfvYmrfToYGT22EK6QDAIlk17W+dcBQzdkXm3YJAWGhkTgi+VgWXvozWTZjmgUXmQYgF2OA== X-Received: by 2002:a1c:29c2:: with SMTP id p185mr14206208wmp.7.1589735881338; Sun, 17 May 2020 10:18:01 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:00 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:19 +0200 Message-Id: <20200517171725.732-22-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 078081c08a..c7144288c9 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -89,7 +89,6 @@ _debug() chk_require() { # Check that every required command is available. declare -a warn - local c _debug "--- [ $FUNCNAME ] ---" @@ -163,24 +162,22 @@ chk_init_sys() chk_sys_arch() { # Check for operating system and architecture type. - local os - local arch os="$(uname -s)" arch="$(uname -m)" case "$arch" in i386 | i486 | i686 | i786 | x86) - local arch=i686 + arch=i686 ;; x86_64 | x86-64 | x64 | amd64) - local arch=x86_64 + arch=x86_64 ;; aarch64) - local arch=aarch64 + arch=aarch64 ;; armv7l) - local arch=armhf + arch=armhf ;; *) _err "${ERR}Unsupported CPU type: ${arch}" @@ -189,7 +186,7 @@ chk_sys_arch() case "$os" in Linux | linux) - local os=linux + os=linux ;; *) _err "${ERR}Your operation system (${os}) is not supported." @@ -204,10 +201,7 @@ chk_sys_arch() guix_get_bin_list() { # Scan GNU archive and save list of binaries - local gnu_url="$1" - local -a bin_ver_ls - local latest_ver - local default_ver + gnu_url="$1" _debug "--- [ $FUNCNAME ] ---" @@ -235,9 +229,9 @@ guix_get_bin_list() guix_get_bin() { # Download and verify binary package. - local url="$1" - local bin_ver="$2" - local dl_path="$3" + url="$1" + bin_ver="$2" + dl_path="$3" _debug "--- [ $FUNCNAME ] ---" @@ -267,8 +261,8 @@ guix_get_bin() sys_create_store() { # Unpack and install /gnu/store and /var/guix - local pkg="$1" - local tmp_path="$2" + pkg="$1" + tmp_path="$2" _debug "--- [ $FUNCNAME ] ---" @@ -426,10 +420,6 @@ sys_enable_guix_daemon() sys_make_guix_available() { # add guix into PATH - local info_path - local local_bin - local var_guix - _debug "--- [ $FUNCNAME ] ---" info_path="/usr/local/share/info" @@ -559,7 +549,6 @@ handle_args() main() { - local tmp_path handle_args "$@" [ "${_INTERACTIVE}" -eq 1 ] && welcome From patchwork Sun May 17 17:17:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22176 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E9D2B27BBE3; Sun, 17 May 2020 18:20:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9F3C427BBE1 for ; Sun, 17 May 2020 18:20:38 +0100 (BST) Received: from localhost ([::1]:46378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxq-0002S6-7Y for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwT-0008Sv-QR for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwT-0004OK-Bt for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwT-0007Bu-8R for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 23/28] Remove $UID bashism Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592327456 (code B ref 40601); Sun, 17 May 2020 17:19:13 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:43 +0000 Received: from localhost ([127.0.0.1]:44618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvy-00078k-Tf for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:43 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:41187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvQ-00073P-34 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:08 -0400 Received: by mail-wr1-f50.google.com with SMTP id h17so9066392wrc.8 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RyxDZBU1WmOsP3F8XEyL3f93+gRXFiQ4O1C3yn3UdlE=; b=ohjG28yTHHFQI0FitsIOeM0fEsXlWw39IGSG8b/u4xA/awvVpUF24209cd9bDCUbrH 9IcamPAMGqESXx1C8GU6GPGiESMzXys0l95JJZifw+fkWOS095cPYWIyjy5nJ68b02U4 NfGzntuM/MNenYMEBW+akyVgy8HsmMQ2aDkt5ufFNBnO9WPmwb8wY2tCebRPWaQVfyen 3Mh2bh1res7TOHWBCbeQhoBkkLwWQILyUMjKcB21uS463x9L0HtmwnO07Ivz/tG62frb JmPstYA9KsP8W/emOaPnadrH8G8kRujbi8BwaEDvo+leMgp6/vJ5Ee6cZrwkhUnTFNun cZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RyxDZBU1WmOsP3F8XEyL3f93+gRXFiQ4O1C3yn3UdlE=; b=jQbezNKQvdMLMmU1moE+jVRnxp1bUnQ7es3COUiZ610zCuLkqGQaK5reQhe6dARKK+ gjN5rAV8eqFgZRBfW+H8wC+2Eak9RoWHHBbApATodHszqATrDSjIhw+GazV2hfQJMRxb Bo0AnfLs9x3YxLcznij+ygmyYMykDLR5BiQGN8qtIGvCLCpEnuhnEnrLyXpVvI3AyvFV FEn1wP6H3OL5tI9IJgTaj918wv6xx5MHLEMEy6ChzYJbIvTLkIQ/IsSKKWmJQKwRbDSB UkgYB2cOr4mU1vKRmsZMyxW3FrOBgGstk3F435JT54D6LUkPAM6QHbgJzdp/k8ZIqAbn UOjw== X-Gm-Message-State: AOAM533xvBG0C+SW/9rp8hpff741wAUbmghD63YWQlMBBp9L6DXcGBgF y0I5JpjUmYwU2J7G36MD1uJgaXpy X-Google-Smtp-Source: ABdhPJyhLey+sPZJYSN7Qp0nlAubhT50kP7KSX+8lPuSvbRm7Y92iBCcRNfQP12kMD+fkBaN+Fx1JQ== X-Received: by 2002:adf:e388:: with SMTP id e8mr14978947wrm.174.1589735882305; Sun, 17 May 2020 10:18:02 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:01 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:20 +0200 Message-Id: <20200517171725.732-23-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index c7144288c9..431790709a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -30,7 +30,7 @@ fi set -e -[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } +[ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; } # groupadd, useradd, usermod, adduser, addgroup are handled in: # sys_create_build_user & sys_create_build_group functions. From patchwork Sun May 17 17:17:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22175 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABB5F27BBE3; Sun, 17 May 2020 18:20:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5680A27BBE1 for ; Sun, 17 May 2020 18:20:28 +0100 (BST) Received: from localhost ([::1]:45978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxf-00029F-TD for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0008Py-HC for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0004Np-6Q for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwS-0007BW-2Y for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 24/28] Remove some "[[" bashisms Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592027432 (code B ref 40601); Sun, 17 May 2020 17:19:12 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:40 +0000 Received: from localhost ([127.0.0.1]:44612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvv-00078K-VN for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:40 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:53046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvQ-00073l-VM for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:09 -0400 Received: by mail-wm1-f43.google.com with SMTP id z4so5823455wmi.2 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RYGsN7xu4LEGoWIENg2PawVTrW0jh9Ndo0EeHej1i9k=; b=JG7jBtpuTx14fZLnO1I88pULHLffW6b0gl6pt/gn4VBO4pD+OqzGapERuy5wLAPkIk 381bD5RGTBz5KKS9uAeffga0RKRqnQrM3AUKT25CnU2sHssiFORtl4uhedWtBT1O4sl2 nv0ubMIIkB6ifu1+xRrSMAm91sPcLkI/ocXUjjWosXT2vVmFLnDeXZYo3iPsPZShzjFe i9LYuQd181UWvsy1rzTdDsKROvV4i/zHjn96qCejocaZuY7BD2YRVeafJZFXqIXF0fKm Y3AQ/wxcd8J5TPzFL7CyApvzZ6bGq0N1Om7z5/N0JW0OzEHDRRK64ZXhvvtKKkhPI6av /iFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RYGsN7xu4LEGoWIENg2PawVTrW0jh9Ndo0EeHej1i9k=; b=qgDBSE1jwwsOnNbcff+Xt1G3HQ2c8CJOBS5EfVcjmlcMDtMDy03nZjxSe6tqg8ksI1 KBkeLP5SGrqYwbT8A/ByZT2E4Xd/ERaHDti78pN9sAYY88lHCin69Kwa0Z0cC6C3Nzu/ R/696mTX71Cnqr4Fqe+G8u/6OQY14bvbQfrM+NgyDcsxbDNznMZydqLDWSATzuHDmPZu N1ioXs5NGwNTn04fa/9k339/HeKE/CZggDv2WhMQLJitORgoTOIAboTWuQL2H2zfWeud Jco5koDHgHfrXVmLxCLHJzFJo8qcJufJ/69JLxybd9qyLClvxHrS933R5I8xkFq+atrD MhRA== X-Gm-Message-State: AOAM530CmxklYiriiKOreJZmm8x2O5UYZwRIgSJNSnH0PpH6YpC2GeC4 CU0F0RPWJKmZ5sFmwjFdnjYXWelS X-Google-Smtp-Source: ABdhPJza04motzzYFoYOu66zetOQ2ZWpJViO09fnTuidcgjcJ5D1RzR4kvbg9bLKVGQ9u5ZYNTIoGQ== X-Received: by 2002:a7b:c21a:: with SMTP id x26mr14723589wmi.82.1589735883195; Sun, 17 May 2020 10:18:03 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:02 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:21 +0200 Message-Id: <20200517171725.732-24-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 431790709a..cd33bf55bf 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -216,7 +216,7 @@ guix_get_bin_list() default_ver="guix-binary-${latest_ver}.${ARCH_OS}" - if [[ "${#bin_ver_ls}" -ne "0" ]]; then + if [ "${#bin_ver_ls}" -ne 0 ]; then _msg "${PAS}Release for your system: ${default_ver}" else _err "${ERR}Could not obtain list of Guix releases." @@ -241,7 +241,7 @@ guix_get_bin() _PROGRESS_OPT="-q --show-progress" || _PROGRESS_OPT="" wget $_PROGRESS_OPT -P "${dl_path}" "${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig" - if [[ "$?" -eq 0 ]]; then + if [ "$?" -eq 0 ]; then _msg "${PAS}download completed." else _err "${ERR}could not download ${url}/${bin_ver}.tar.xz." @@ -250,7 +250,7 @@ guix_get_bin() pushd "${dl_path}" >/dev/null gpg --verify "${bin_ver}.tar.xz.sig" >/dev/null 2>&1 - if [[ "$?" -eq 0 ]]; then + if [ "$?" -eq 0 ]; then _msg "${PAS}Signature is valid." popd >/dev/null else @@ -275,7 +275,7 @@ sys_create_store() tar x -f "${pkg}" "${TAROPTS[@]}" && _msg "${PAS}unpacked archive" - if [[ -e "/var/guix" || -e "/gnu" ]]; then + if [ -e "/var/guix" ] || [ -e "/gnu" ]; then _err "${ERR}A previous Guix installation was found. Refusing to overwrite." exit 1 else From patchwork Sun May 17 17:17:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22171 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A959427BBE3; Sun, 17 May 2020 18:20:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7E90B27BBE1 for ; Sun, 17 May 2020 18:20:13 +0100 (BST) Received: from localhost ([::1]:45218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxR-0001ki-3M for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0008QX-SN for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwS-0004Nw-Iw for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwS-0007Bf-F9 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 25/28] Remove unused variable set by "read" Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592027439 (code B ref 40601); Sun, 17 May 2020 17:19:12 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:40 +0000 Received: from localhost ([127.0.0.1]:44614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvw-00078P-8l for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:40 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:46718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvR-000742-Rd for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:10 -0400 Received: by mail-wr1-f51.google.com with SMTP id w7so9032220wre.13 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EAzDVhVod1ErbrL1tlrLaAfDXkL+g52Ru2oeH2B1pQA=; b=O7Nr8XvIlvF6ZD8FS+zCb+aRdxnZESv2Po2rTT4dytrI61zz3B/Z1/corqD6HnmlP3 Bg7fty/vp2p67C4dXsw/klMiw7D/7rKqLZtuviZRn8A/CHF57CPH+f0AaxunPN+Ub7uO /mkOrTeZygehnyFfSMMgEaNkxrZhzJaVyq4URb+tF/cic1TBk001T9DRW08rFNEyV7gW IsW0NokeP1rbfJYfxlBR8xXjyLLKOcpGKlKwzPMSPtMZp0fDPq0i80cHMYbsBrSpVTf0 KELPhT1CZgjtH6xGOwLPDx9q075bXzHw9HCba0CoMcRE8iz9wPgf4sKWW6nQsjeDW0hW Sk6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EAzDVhVod1ErbrL1tlrLaAfDXkL+g52Ru2oeH2B1pQA=; b=XWml/uv5XoKKVcqJwPfr5WSM+/wDQQkss479UPd2pzq1iW7T5nX1veU6suVCWuwv4k RYSHZkxEitBiycpiaeb3p4E00Z4ofq6Osg1TIAr5fFWggEGQmZFu2B4vEjRXVmS9pvhr tAeBhWuAf6h1EZLuEPQxhG5XXdlEnnaDwB+eXJgZn37zShzpZWTuxpw8EEWSukVf83wO MGYaqWEAo7c5yEPwxQ3u88XLcqrz8L45mZV5jChEgCFpRodmiy20fVSgN1v0m3jckIAC 2ruxzX2nVJo57BB4nQwe7szGNsfArWTxBwxBhmjibKTEal9b7HeuokhChTcsfpNpiOU2 U42A== X-Gm-Message-State: AOAM530BDi6Hhb/zLs3QTp8DlQBxwIk3G2TlctNw9SoY7Ud1oEirYa+V YgUPpAe+Li5d2uZL6ZvGPfwjY3Ma X-Google-Smtp-Source: ABdhPJy0z2C1snbouhe3fvNzt+xTF6xBNOCFyQ9Vv+8VOrNKZ2P8mbQhG91VrmbpFR+bK0yTVxFoYQ== X-Received: by 2002:a5d:530b:: with SMTP id e11mr9662721wrv.85.1589735884135; Sun, 17 May 2020 10:18:04 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:03 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:22 +0200 Message-Id: <20200517171725.732-25-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index cd33bf55bf..38f61de2f7 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -514,7 +514,7 @@ This script installs GNU Guix on your system https://www.gnu.org/software/guix/ EOF echo -n "Press return to continue..." - read -r ANSWER + read -r } # Do not change the tabs in the HERE-DOCUMENT From patchwork Sun May 17 17:17:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22173 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E0CD427BBE4; Sun, 17 May 2020 18:20:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 47B4E27BBE1 for ; Sun, 17 May 2020 18:20:20 +0100 (BST) Received: from localhost ([::1]:45590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMxX-0001w7-RW for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:20:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwU-0008Uc-6G for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwT-0004Oi-Pp for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwT-0007C1-LV for guix-patches@gnu.org; Sun, 17 May 2020 13:19:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 26/28] Add _debug_func() helper function Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592327463 (code B ref 40601); Sun, 17 May 2020 17:19:13 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:43 +0000 Received: from localhost ([127.0.0.1]:44620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvz-00078n-6R for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:43 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvT-00074n-HX for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:12 -0400 Received: by mail-wm1-f66.google.com with SMTP id m185so2875717wme.3 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jag/TTrlmDKE19yEhetNbRYZiC8DGMGy2oHhJkzWPI8=; b=uDk/jivmp55AQEm5zns/eOmKfQzCFaz/Ci8WI4bZUio6UDujmBvvrVL8POPXvK8AdB Jg0ZeFvoEipIMx9GtHvqViz7z6+ESXFHFB9cU2xNiFccpSTOPfnxvvewxrM8O1tyJIY3 HtZ8MNrFnQakhRXZJtYrk3GKqk4Ueu6WsZkgVRQoswHm2LzVXKpN2ejzmHFlyaDhYe72 M6A8c9Qj72YH+WJjKIl3tokqml90tpip2zj/8kna4ACjQIzlsxC/fUnIphbRDvUOfuKi 4Cx7+JCyhDIcTfnzLV1cInxf9qhoLmpDOigFim6HyhwDG/+K6fPHCslaBHvl+0ZM7227 XRzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jag/TTrlmDKE19yEhetNbRYZiC8DGMGy2oHhJkzWPI8=; b=s171sRXKT92WRkWgF1pJCAq/j3hDuI3mynSbfx/Nao5KoCpOBHTVgAQEed6ZrkrTfp buIXZPMiZrUTncVwPcD+NWNdxR2RLTwkhuKHW7IFjK2YvNA216Tx16X76O5X2jlQHzLE XsNc2mo8ntvr5S3F/un4yE1P1rELfCb8WvV6xxFMuD+FTIeQqNvgrhFZlRLmK7A0UCA+ Re51lEios8+8zbpKL5zYsz3botPzhltKpYrd/CK1+/sUrD+AQ3sHb/w0scdC2z5feVNn Yz8ihSvb+lsF+XBv8sBcX7o4vNKg1cOSSVifsZO721PrUhrFDMZYrGWXHqS4/aHjTL1z 2djw== X-Gm-Message-State: AOAM533r3PI5msB6EXUrl/DDifWVVkGf1vWJCILrdpFdT4bCJuW3Keo+ AxNxU1sHi+9hxtECNLWQqNkkMByb X-Google-Smtp-Source: ABdhPJytff3K/bOs6vlDdlBMOSc1E0khWUNT+BYiuk6+qdazINlCh5Xly+igZ5WGU20WISado7jtYg== X-Received: by 2002:a1c:2c0b:: with SMTP id s11mr11309882wms.97.1589735885015; Sun, 17 May 2020 10:18:05 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:04 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:23 +0200 Message-Id: <20200517171725.732-26-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 38f61de2f7..4ee350a155 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -85,12 +85,17 @@ _debug() fi } +_debug_func() +{ + # Display _debug_func() caller's function name + _debug "--- [ ${FUNCNAME[1]} ] ---" +} chk_require() { # Check that every required command is available. declare -a warn - _debug "--- [ $FUNCNAME ] ---" + _debug_func for c in "$@"; do command -v "$c" >/dev/null 2>&1 || warn+=("$c") @@ -105,7 +110,7 @@ chk_require() chk_gpg_keyring() { # Check whether the Guix release signing public key is present. - _debug "--- [ $FUNCNAME ] ---" + _debug_func # Without --dry-run this command will create a ~/.gnupg owned by root on # systems where gpg has never been used, causing errors and confusion. @@ -203,7 +208,7 @@ guix_get_bin_list() { # Scan GNU archive and save list of binaries gnu_url="$1" - _debug "--- [ $FUNCNAME ] ---" + _debug_func # Filter only version and architecture bin_ver_ls=("$(wget -qO- "$gnu_url" \ @@ -233,7 +238,7 @@ guix_get_bin() bin_ver="$2" dl_path="$3" - _debug "--- [ $FUNCNAME ] ---" + _debug_func _msg "${INF}Downloading Guix release archive" @@ -264,7 +269,7 @@ sys_create_store() pkg="$1" tmp_path="$2" - _debug "--- [ $FUNCNAME ] ---" + _debug_func # Do not use the --warning option with busybox tar TAROPTS=("-C" "${tmp_path}") @@ -297,7 +302,7 @@ sys_create_store() sys_create_build_group() { # Create the group for build users. - _debug "--- [ $FUNCNAME ] ---" + _debug_func if getent group guixbuild >/dev/null 2>&1; then _msg "${INF}group guixbuild already exists" @@ -316,7 +321,7 @@ sys_create_build_group() sys_create_build_user() { # Create the user accounts for build users. - _debug "--- [ $FUNCNAME ] ---" + _debug_func NOLOGIN_SHELL="$(command -v nologin)" for i in $(seq -w 1 10); do @@ -352,7 +357,7 @@ sys_create_build_user() sys_enable_guix_daemon() { # Run the daemon, and set it to automatically start on boot. - _debug "--- [ $FUNCNAME ] ---" + _debug_func case "$INIT_SYS" in upstart) @@ -420,7 +425,7 @@ sys_enable_guix_daemon() sys_make_guix_available() { # add guix into PATH - _debug "--- [ $FUNCNAME ] ---" + _debug_func info_path="/usr/local/share/info" local_bin="/usr/local/bin" From patchwork Sun May 17 17:17:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22161 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3EF0127BBE4; Sun, 17 May 2020 18:19:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1067F27BBE1 for ; Sun, 17 May 2020 18:19:44 +0100 (BST) Received: from localhost ([::1]:42614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwx-0000lA-HF for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwU-0008W8-IR for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwU-0004Pj-6r for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwU-0007C8-31 for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 27/28] Fix variable use in guix_get_bin_list() Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592427470 (code B ref 40601); Sun, 17 May 2020 17:19:14 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:44 +0000 Received: from localhost ([127.0.0.1]:44622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvz-00078u-Iq for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:43 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvT-00074s-I3 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:11 -0400 Received: by mail-wm1-f66.google.com with SMTP id w64so7743929wmg.4 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aA+/4qneJv1BAegkxsojfBI+0JOCq6Mdfkm6K8sE+Xg=; b=I/T84K78y/r44hi6P3J9FcdNDN/cLr8n8BSIwCNJClGgrHP0YytPE6jmEcEAI1XaJh J7YS+r8W/yyyiPDN0Morzji5+ZXlr602WbkQWP7otcldNY+mpywLXDCvpry88NZrokHG pz9mLC1fA+MzoXoRQyoHQLtMNeJbeuox5nzldyUpnB3lL0SJGU4haLNAuyfnrwEiWFGt rQL0/b5XbeRY+vtzIJpYSBBkPJgO5COhy9V12mTz4Uf80af67LeqcbDTk9ASRyv0INMw mCm+i6pfek9EKTshugmJYYQVHf5f4MXl576xHTX9RVCSydgUn6Rd49xuWOTKPubNCSRo ArVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aA+/4qneJv1BAegkxsojfBI+0JOCq6Mdfkm6K8sE+Xg=; b=iFfWAiX/r0I3lAw56GY82tcGV/jfArFdiot7Ho4WDaFoNqKXJ3eTVa5MwZ/Wjuo8Lm OnKw1zgzCXnFziUwV9+SmA9rKpFdsk1zz2mQH5xAQ4QdR6n9XwvMMVSI2WeO6iWg2zwk 7LDW6vriPIhOosGpVxX8xF0qpdCC09HRPljY038lywYl6ax4c1cVJCilOt0w6G/8hl8K t6yW6QMZEIj8uqbcuKC80x0cY0QPcNw2htFo5J0YzXUCo0zE15E5QaM35MxtIGNLHOqO r3/Pqt7Iva2w09Xpt8aU89lCdXMDR9BT1q+K1jNZWbusVV/tkjKij7sKOleSi7W5I7q/ DZ9w== X-Gm-Message-State: AOAM533TEa3NzN637kmVZ9r8IDRh6XxfTjQ/K863C9f4lFMsEHsYMTQb JWevVrlUB+D2QAlkN0UAniMVHQoB X-Google-Smtp-Source: ABdhPJzZ6WvXbitAP+37sW97tDQhVjasmO71bBep1qu9mZWQo2d0XZJjyRHEl7CseYRenP3/rBIqbg== X-Received: by 2002:a05:600c:14c6:: with SMTP id i6mr14660165wmh.58.1589735885874; Sun, 17 May 2020 10:18:05 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:05 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:24 +0200 Message-Id: <20200517171725.732-27-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches - Add missing curly-brackets - Add implicit array zero-indexing --- etc/guix-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4ee350a155..be2fd74905 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -215,7 +215,7 @@ guix_get_bin_list() | sed -n -e 's/.*guix-binary-\([0-9.]*\)\..*.tar.xz.*/\1/p' \ | sort -Vu)") - latest_ver="$(echo "$bin_ver_ls" \ + latest_ver="$(echo "${bin_ver_ls[0]}" \ | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}" \ | tail -n1)" @@ -229,7 +229,7 @@ guix_get_bin_list() fi # Use default to download according to the list and local ARCH_OS. - BIN_VER="$default_ver" + BIN_VER="${default_ver}" } guix_get_bin() From patchwork Sun May 17 17:17:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22165 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 39F8127BBE3; Sun, 17 May 2020 18:19:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E614827BBE1 for ; Sun, 17 May 2020 18:19:54 +0100 (BST) Received: from localhost ([::1]:43412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMx8-00015P-DX for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwV-00005S-0T for guix-patches@gnu.org; Sun, 17 May 2020 13:19:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwU-0004Pq-LF for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwU-0007CH-Gc for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 28/28] Remove "[[" bashisms in chk_init_sys() Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592427477 (code B ref 40601); Sun, 17 May 2020 17:19:14 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:44 +0000 Received: from localhost ([127.0.0.1]:44624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvz-000791-Su for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:44 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvU-00075J-Dh for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:12 -0400 Received: by mail-wm1-f65.google.com with SMTP id f134so6997914wmf.1 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ubhbQCy/xKyaGnm6shHlPKr+jGTj6oKsxoPaRxJZUsU=; b=VVsrQB6LXbP3Xc4gsAjeuVwyt82gnqtys3YoCP1xr2oG7SHPIAudJdXnOgffuuTdJv CT1xMFWEprs/Cahczh/v4Sum08A+DLp64Mpj1DjwS5wMu+GJNHmvPXY2CUPA6AbFanVI oeurzJjniU8Gb31RPZ33gWDD8pKjNULq5JorpQkodpM/sxhVY3vH0zsMdgFr9r9IeWAX GtVWP4yMdY9BJPeVPYt74fv1o38viNQv0nXP0Z1vkRxma5FyAcmvZGuFWVifXdHh2F3G 0tDMTohVqFCWaU+Yr3wU7lgOJNdfDKQNF+u1O/Z72T1xyt1WpPCJc6sYJRx13OWwh9YA MecA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ubhbQCy/xKyaGnm6shHlPKr+jGTj6oKsxoPaRxJZUsU=; b=rDaRHfR7b9cObTf8I4D6BhwcgoBnhcRdBGQ6sO6dmEwQoir6deCzwwKa/TE/uEXD5w vVwWsHAK2Wax45zLykUWawI3VnWwI7SKPUii8FAFa3sgTqSaH1X7tHcmIZREricUnFnc nnCRF4UDsjf//7wWXzem+bOYRk1ykb/Jhau5Tf9WRyqMJuf9qleL4REa+ZnJ6Pr0JeXf OfFYcfbe7i+XnsJbAP51oKbTgaFLgSFueXeaodMzq8rmTOwLETuOjZbvqoN9VtvJzrCE APZXJ6p1pVdg5VJ5zn8zwEg/83SoNkw/pqwTVkaZR7vEhbpbjZ2JJQFmWMIl05NqMi4s n20w== X-Gm-Message-State: AOAM530r09QOyiLtFnL+o3sB3dbE3A7a5ZOciVPP0TBoFeaowiDweZ6a nKhoeT6p2rUzbC5oXLyFw3+Gfrqq X-Google-Smtp-Source: ABdhPJzd/AkBjKDtWj8AsFCBYBC/U3ITC9umoW5J72heQGrQXQn/1NNq6rMlS+PaY+DRpMnCUEeEWA== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr14087017wmz.29.1589735886742; Sun, 17 May 2020 10:18:06 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:06 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:25 +0200 Message-Id: <20200517171725.732-28-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index be2fd74905..45b4c4b720 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -139,23 +139,23 @@ chk_term() chk_init_sys() { # Return init system type name. - if [[ $(/sbin/init --version 2>/dev/null) =~ upstart ]]; then + if /sbin/init --version 2>/dev/null | grep -q upstart; then _msg "${INF}init system is: upstart" INIT_SYS="upstart" return 0 - elif [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then + elif systemctl 2>/dev/null | grep -q -- -\.mount; then _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 - elif [[ $(rc -V 2>/dev/null) =~ OpenRC ]]; then + elif rc -V 2>/dev/null | grep -q OpenRC; then _msg "${INF}init system is: openrc" INIT_SYS="openrc" return 0 - elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then + elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" return 0 - elif [[ -d /etc/sv ]]; then + elif [ -d /etc/sv ]; then _msg "${INF}init system is: runit" INIT_SYS="runit" return 0