From patchwork Sun May 31 20:42:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22477 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 5E5D127BBE3; Sun, 31 May 2020 21:44:11 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 E48AF27BBE1 for ; Sun, 31 May 2020 21:44:10 +0100 (BST) Received: from localhost ([::1]:50478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUoU-0006da-FI for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoM-0006c6-MD for guix-patches@gnu.org; Sun, 31 May 2020 16:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoM-0000q9-Cb for guix-patches@gnu.org; Sun, 31 May 2020 16:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoM-0007Je-AJ for guix-patches@gnu.org; Sun, 31 May 2020 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 1/7] guix-install.sh: Remove "[[" bashisms in chk_init_sys(). 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, 31 May 2020 20:44: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.159095781028003 (code B ref 40601); Sun, 31 May 2020 20:44:02 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:30 +0000 Received: from localhost ([127.0.0.1]:33927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnq-0007Ha-AQ for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:30 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:55926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUno-0007HI-RD for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:29 -0400 Received: by mail-wm1-f66.google.com with SMTP id c71so8818321wmd.5 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:28 -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=VUi2SsoAaClYlftOEEn4+ZZHwioAk5gIhNv99Z/xAq0=; b=lz4jDi4PgkVXEunwZe5/L0FqdbBzb29qV7tb4rOqmVVtAcUxY+a9uSIHPvJa384Qe8 FQqTmNr4TMHMIYSPx/1dZhFJkZSIo6jp4SYqEUkmZOX/kgmKSkcRouG/8gdAs3lgW5I5 ohjKHUQ8C8mdapt7d68RS6wOrrOq9sCH1MQNVjpAUvI4GnFejJVTJnriYznQGCZ65Wjs K0q4dMk8R3K7FqlpHvIjdenM9x8YhhdE5TWFXMjZeq5SSn5jlPIbNl0ZcFslrZuWahlX PPHlyUyPSmHsRUP45pqfbGITEqPalT5748XI+3G+gZCshqkFYLpB1/XZg6nXGpfuS4so j4sw== 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=VUi2SsoAaClYlftOEEn4+ZZHwioAk5gIhNv99Z/xAq0=; b=I0O0DLPRhr1mqtTER1hAngeNNk+9GuIHWd30GCe+05v0G/fMCyo/zi2ZSiwRjzLRq/ 3aP3AK0Pfwzhpo85xn7klU5bzQA4Bz0OqLNNsrxvYuPHXN+PNOyxXstYZgoxJaQp/uic h52fyqscwzEqtj/SxtkagfnYFIinwJLPrPkzdhOA5D1bPNlyaoJ2iQK7eeni9rfoXsA8 vgbPt1siwgZVlXYCBbCp6PrjLG0zAsv6qjOTti7uV0WqcICYXLF3TeazroShb1q2aluU ILHPN/CaRkuRW3lFiZo03QDIUsJWyfYIXLAbNGdkTzX2hIBl4kh7R8hulDkWtwMVMMa1 V+mg== X-Gm-Message-State: AOAM531bj3n0oaTWJYzA2e/aPjoro8tCpadG3tS8BKVUurkQl+RUUHqE cQNkIogPQ6wsP1y3vt5zcqE43z4G X-Google-Smtp-Source: ABdhPJyztxevd+eNeK949jqIBb+zv1IZ+ZmuUQHQN8PkLxiCVXeKaqSpzeNanKV7gXw+tf0B/pOdhQ== X-Received: by 2002:a1c:3281:: with SMTP id y123mr18385728wmy.30.1590957802838; Sun, 31 May 2020 13:43:22 -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 w10sm18728850wrp.16.2020.05.31.13.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:22 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:51 +0200 Message-Id: <20200531204257.18725-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 * etc/guix-install.sh (chk_init_sys): Use `if something | grep' instead of "[[" pattern matching. --- 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 bf15aede21..455e021684 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -138,11 +138,11 @@ 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 From patchwork Sun May 31 20:42:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22482 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 BF9DB27BBE4; Sun, 31 May 2020 21:44:24 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 728B627BBE1 for ; Sun, 31 May 2020 21:44:24 +0100 (BST) Received: from localhost ([::1]:51536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUoi-00077P-0J for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoP-0006di-41 for guix-patches@gnu.org; Sun, 31 May 2020 16:44:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50637) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoO-0000qd-QD for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoO-0007KM-Oj for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 2/7] guix-install.sh: Remove $UID bashism. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095783828104 (code B ref 40601); Sun, 31 May 2020 20:44:04 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:58 +0000 Received: from localhost ([127.0.0.1]:33944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUoH-0007J9-OB for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:57 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:45271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnp-0007HK-HR for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:43 -0400 Received: by mail-wr1-f53.google.com with SMTP id c3so9400756wru.12 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:29 -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=Cit8EcF1+Ohubp5rixRkhSB2/owXcE6ymR0td3o8k78=; b=Neu7GjzQ+jFC61zBuN2f5tOAi23gx1dpmKlBqI9hBSeht8LEFzFlGjAqmEo9xlU8IP qE0T9662kXUzplNqglX/dFI/bbTXGj9OHEFhF6PNP0lpeTX/BOc0rIE0BfMa9CeJ+Osr Edj23Vr4xTa4CfyYqnyIlMkkIc9Y7LFE901NHGCsTFoT41tYV8jdLSz8xfxTH58IN/sr RcD4ZAowgTYSwOIkD3Wt5xU6K6E/tqhU2u0jVo1KZ9BQmwAsyzxDxL0VAfDdvazyfQIG zDGeoekh6G8F01M8d8ZSEsa8vBEU4tcoIrf1eYBBSO35wW1DgM7UdF3cL0HOVczluBbe zosg== 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=Cit8EcF1+Ohubp5rixRkhSB2/owXcE6ymR0td3o8k78=; b=i7ogUZKXStpFe8M1P46xNaVNmWrENQOB8ER075HYcurtR9sdx/2Hl6VigxpFM3YZ1k 8oYOq7PjJbuKpIpb6Fh8TtG5x6RqECDWyUwJYVPze0qHV/wFOfpkwQzasFFseKkaLEA8 RVHbLhHC4hUiZKS3fyHjw6hIuAoXFUht5FFPDSYdW2k2+vOZOx2QpJD2VaBPw4xq3Es5 aL0ExTSjowT0oE8uN7kk908TEUi6vJp1as4TYSwrAQYViDKeCEf/cYDnO6sFuq61gq3n SBAq+aip8JI1dZMMnLOWPMU4wha8vv4vGm+Bu/eXAHt1YEIRSs3kXzC9BGGjdl8xdlKJ DADA== X-Gm-Message-State: AOAM5322CU+mWezND6Mh6pArIRzV8DUHFfAgcrJRiQQYRCAntF/DKtHu 0ABdBawFNA2bI+XulPhiScCVv6fT X-Google-Smtp-Source: ABdhPJySkrkjJraROlN8rsxhbPYrJ+dYBKtrmdNBMlN9CX0hquhS//xiWMFa2BHo18IOusaOyclnyA== X-Received: by 2002:a05:6000:1083:: with SMTP id y3mr18075202wrw.425.1590957803805; Sun, 31 May 2020 13:43:23 -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 w10sm18728850wrp.16.2020.05.31.13.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:23 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:52 +0200 Message-Id: <20200531204257.18725-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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: Use `id -u' instead of $UID. --- 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 455e021684..0d7a8c8d44 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -29,7 +29,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; } REQUIRE=( "dirname" From patchwork Sun May 31 20:42:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22476 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 576B727BBE3; Sun, 31 May 2020 21:44:10 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 0784227BBE1 for ; Sun, 31 May 2020 21:44:10 +0100 (BST) Received: from localhost ([::1]:50462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUoT-0006cb-ED for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0006cC-20 for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoM-0000qD-Os for guix-patches@gnu.org; Sun, 31 May 2020 16:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoM-0007Jm-N1 for guix-patches@gnu.org; Sun, 31 May 2020 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 3/7] guix-install.sh: Fix requirements. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095781428036 (code B ref 40601); Sun, 31 May 2020 20:44:02 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:34 +0000 Received: from localhost ([127.0.0.1]:33933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnt-0007I0-Jh for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:33 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:40888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnq-0007HM-HQ for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:30 -0400 Received: by mail-wr1-f49.google.com with SMTP id h5so3530683wrc.7 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:30 -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=GJJzgbrgLVaptOy2PM7dKVjOxXb+kggJzpf/j2QH2c4=; b=OZf7FDVIWDW/9ePukfR8zbfYu79EONj4xiEux96VmBNwr3p59GdkwTApjdo40GmMIq nsq7PhkCxNPVkimEDK8hoJLtW9GxtylfGfbLXVgS1Q/Q6D741UYIK5Rgt3gI3GId/1v4 xf2VYRjhWKdnNJKXc2fA0TykNJubxMeL0EpJ0dXOS+Vl02i9udO/YA3CrwEvaMANMToQ 1wqsAzuakCw2GGEFtN2H10LuJyRAUn4UO5V8ZqB4vBOW3wpGgIJXDwz24x9xZEYvNTwC /NRhiehf0aA0x1W7a00Sp5wiPnhskKydVJVnq3rmhKnrEmZDJApkwdYZVXdxykkQhqVC AckQ== 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=GJJzgbrgLVaptOy2PM7dKVjOxXb+kggJzpf/j2QH2c4=; b=SqjSSzAdIDQZqHs+z3BQETnYvhJhuKD3W2Vnvm2immWMWniY6Lp5pMExYeK5G5Rkny o33bY7Z4e+ZtpXi/Os25X3YxbKyypD6EFV2HYtFwQY/ibdeTTnwpbLqDJoBvNl4tzeW3 rwbvJvLGo2NdKAazfOW3v7XiTFbFrYg1GGwxGaUwrVclONzr8KB0VFYbUBI52zXnwSwH lL4Cw7B+gCLPMbcUcuFzr538pzUHRH+KBmZih/k/PouJKPuhLVdXPjvENkOgb0u9i2OK sASkLrWSmD2qE7GtcMBFtIzQNyXjJU+BhJJlP/+HB/mjm9jSkWI3e1derWa7+tQBq87M GzbA== X-Gm-Message-State: AOAM532WFqGxo01LR9/nR79fA2boPrqTuDC/rhOU15rElTMEsdrCaX8P HhHURvoOGL2wQHcucGlffdovkokN X-Google-Smtp-Source: ABdhPJwHJMpVEBpH9uaLXN6S0JhctFbj4t2gg/2og9vLQC7rWqEliX/7oo3lyvhGCUjN8Z5ThY3ryg== X-Received: by 2002:a05:6000:104f:: with SMTP id c15mr11922351wrx.391.1590957804726; Sun, 31 May 2020 13:43:24 -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 w10sm18728850wrp.16.2020.05.31.13.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:24 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:53 +0200 Message-Id: <20200531204257.18725-3-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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 0d7a8c8d44..28fcf831c5 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -32,8 +32,6 @@ set -e [ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; } REQUIRE=( - "dirname" - "readlink" "wget" "gpg" "grep" @@ -41,13 +39,14 @@ REQUIRE=( "sed" "sort" "getent" + "ln" "mktemp" "rm" "chmod" "uname" "groupadd" "tail" - "tr" + "tar" "xz" ) From patchwork Sun May 31 20:42:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22480 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 3AE0B27BBE1; Sun, 31 May 2020 21:44:19 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 3E11D27BBE4 for ; Sun, 31 May 2020 21:44:18 +0100 (BST) Received: from localhost ([::1]:51074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUob-0006uf-PK for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0006cI-Fl for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0000qH-6H for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoN-0007Jt-4V for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 4/7] guix-install.sh: trivial whitespace fix. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095781428043 (code B ref 40601); Sun, 31 May 2020 20:44:03 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:34 +0000 Received: from localhost ([127.0.0.1]:33935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnt-0007I9-Su for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:34 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnr-0007HO-H8 for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:31 -0400 Received: by mail-wr1-f67.google.com with SMTP id x6so9377749wrm.13 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:31 -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=2/qLmiMk4MM5dHyyygZ79L/cRmb1Z9Gsz1obqa2+FXc=; b=euysIlUFMSwNwZKXSx69yZSt51lNzlK2WisyKbquZiVVEC++lYepwq/fukNkUVslp7 XtKZ6OvG2QkOJf8ERcpjlujvvIZLpM5Dr0B6QXgE2SGfz2MJAyGDVSk1HJijM5ZHO7CX n0nSd+bJ/TokHJF5Z5MJmQSbD+oooJrFRmMZeUkV8h2DbZyuqbTjv1++KqCGkJxEixLV wKEGSweWAgt44iVN2aZ1sKsMdZWZbO6DwVWDAGA2O6DOli+sSSNM38jeXubTeL++vBPa hpi12SATAgXt1jV9Rr4j5KIH14rs9Y4OkEn5jMMFX2VCRtrrhqm2N9MbMirI6hmFs9Zr hAgA== 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=2/qLmiMk4MM5dHyyygZ79L/cRmb1Z9Gsz1obqa2+FXc=; b=r2zHQjo73IfmXOkah6QeRCDo7HuVqIi0wOgbhPZu+UMJKodTKKT/+Lb9j540FNnvt8 c03R5eTZ/GkIrDQjyDaz2sNwqLILqScx1ZDft1K3NilwjdS+pdw5CqokCFHYiip9Nqvm JHPx7IuXUHSC7ojlcwy+CJ6YKw5I5j7W4ZeYppfXeV4AanA3JZ8qxv7T9YWxgAb34dTM E0VX9vL36yGQ4BGJz/a1YZ4RL4oV5w/JExtOnd3/ej4bvRLo/xTSEGM1c+geJExO71FE omHyCUQRT0QB+p8i7GC5vqn57MmKZI/0UzMTkFusyvF1H55CfbmeOrLLFSuhCunU17Pd y2ew== X-Gm-Message-State: AOAM5324z3Wq3ZHAoQUdwOhXElKqMOb2H2Z8O73EQCdElg/A1E4PQ5Uv Y0Nd/iHMYz3ZGsdOh/RWiGN2uKRk X-Google-Smtp-Source: ABdhPJwTGli9gD4UUNPUBKnItVhYroOM1YtOE4U7M23vGpXwQiAXXOvW/JtDmJC0KW2pBqxDnGegGw== X-Received: by 2002:adf:e908:: with SMTP id f8mr18582718wrm.184.1590957805650; Sun, 31 May 2020 13:43:25 -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 w10sm18728850wrp.16.2020.05.31.13.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:25 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:54 +0200 Message-Id: <20200531204257.18725-4-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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 28fcf831c5..14616f790b 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -173,9 +173,9 @@ chk_sys_arch() aarch64) local arch=aarch64 ;; - armv7l) - local arch=armhf - ;; + armv7l) + local arch=armhf + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 @@ -355,15 +355,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 gnu-store.mount guix-daemon && From patchwork Sun May 31 20:42:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22478 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 30BBF27BBE3; Sun, 31 May 2020 21:44: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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 CA43327BBE1 for ; Sun, 31 May 2020 21:44:11 +0100 (BST) Received: from localhost ([::1]:50538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUoV-0006fB-Ak for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0006cQ-U7 for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0000qP-KW for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoN-0007K0-Iy for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 5/7] guix-install.sh: Add variable quoting in sys_make_guix_available. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095781428050 (code B ref 40601); Sun, 31 May 2020 20:44:03 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:34 +0000 Received: from localhost ([127.0.0.1]:33937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnu-0007IG-BP for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:34 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:50998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUns-0007HQ-F5 for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:32 -0400 Received: by mail-wm1-f48.google.com with SMTP id v19so8874267wmj.0 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:32 -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=dL9ifNk6TuOaLGM005YpVnEuBAyXtpnon6mFwAi1oUY=; b=QwKf+sUxLEJ1dHDdbRD4tktL5frvxt5cqxjfTutXXQ4FV0XCMCzqu66U+rjc7zCkmO YdkrSnoI6RIOj2gyeA3ZhsjVSJjkmDTrZUU5fwwo15CMaAD893qu9CwLzij6s1LLHA9s +CXxhnOEJk5RfjL1StEt+ySwM44avGTaBqfssGnckxAwcBU6tqlZh1tjaIYzQjUsPAvq 9CRwPHH0w/F8qp/ow56g3QXZa5jYGy/dhdEUZAlPfhTD/ejBb5/YYJvs+sWXRWqxtQsj HFbWbOrhgyjnwVhFP59wmRiTe2DkNRquWTZHO+zI+6CnWD8QB7Omol6p6CAH6kbgl6xW PKuQ== 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=dL9ifNk6TuOaLGM005YpVnEuBAyXtpnon6mFwAi1oUY=; b=rTE61HJ+QIIaeSyGjZr1LBjPXkqHsDzHfD3YB8nS6W/tb72kkXGdWtdYTMfITI4mD8 2ovjekPphq+7VnziEFyb7abao09joZ9oof/YsFU5SYL3g0wjvqX7RvrIf3k368JhrSa9 1HwxIxL4a7h+uBVsTn6veA0uEClPv9k65QyThS9N2Ne2hlLhouuOUMNlW7CaqrjT9NK+ N9Th/mRCvGSVwMI/rpuu5srJKtqA+eY9gEKERI7vuBnxd5RwvxYYzu0pryjn1SunxXrb 5uVMNJEO2n3GyOcSYOMd0xMGBL3gnLmUPnUR9V5rWbjns0IV1yaiXTipFZLwLEG2d5jI aFJw== X-Gm-Message-State: AOAM531SaoerxXgDH/VpqhVKayYjt5Ctt/vau7eWhHDN2BhHmse5jyTn 2OzMfmZXN9/UtawYR13Quq5OkeBe X-Google-Smtp-Source: ABdhPJw/n9Ah3Dgs4bw+tutXjVkq57FL4Lhi+Te7qBYs9EDy8K7zlebIJGusTu7M7dwC4aGvgA9e2A== X-Received: by 2002:a1c:80d4:: with SMTP id b203mr18569734wmd.138.1590957806631; Sun, 31 May 2020 13:43:26 -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 w10sm18728850wrp.16.2020.05.31.13.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:26 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:55 +0200 Message-Id: <20200531204257.18725-5-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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_make_guix_available): Add variable quoting. --- 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 14616f790b..0e6e6842a1 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -393,7 +393,7 @@ sys_enable_guix_daemon() 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 31 20:42:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22479 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 E1B6527BBE1; Sun, 31 May 2020 21:44: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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 34CCE27BBE3 for ; Sun, 31 May 2020 21:44:18 +0100 (BST) Received: from localhost ([::1]:51062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUob-0006uG-O0 for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoO-0006cX-AY for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoO-0000qT-0k for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoN-0007K8-VP for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 6/7] guix-install.sh: Fix variable uses in guix_get_bin_list(). Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095783728091 (code B ref 40601); Sun, 31 May 2020 20:44:03 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:57 +0000 Received: from localhost ([127.0.0.1]:33940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUo3-0007In-Mx for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:57 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnt-0007HS-AY for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:33 -0400 Received: by mail-wr1-f67.google.com with SMTP id x13so9483465wrv.4 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:33 -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=FNGy2kJNz0Llgz+YOnMLJPjsIHRK/neaz0idapHB0GA=; b=owt16Bm4xZZf+A+OvIRPqaspPIY/K7AXseb7pSYTDxsxz/WoynNSphjbYkeo4FwuFk 1ynCKfSkE19AOJ0q28F29IcqEBhEPDager6tUIjZZr4ts8Ifo3tABk2RsHnSMtAgx0iI Qm0nhvR2QUr8x6yOs4d2XNWgrfu2chG01Mg8UodZhz3VCSMr6tDFUjJrYk9SDa+nw0dX SNS0p/GvugWcB307ENgfSPo3iUveepTZyZ68/cuWRLcugW/ybL7HMyNAYk2Eefsyaxte kc2IzSrvFxYZu4YPwAgQ3bVEwHAjsYOhqypZM8lrtUoC1kKqF5l49Vcc1HI/U/GmsOVs d2Vg== 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=FNGy2kJNz0Llgz+YOnMLJPjsIHRK/neaz0idapHB0GA=; b=VeaS/nEzSBicoxUb77PC3HwpvGO5ha9MOV2H65SQecMMsj7Gk26Bb7zk7VtxzdyyDk B3/Y7FSdE6x+0cKZLmJY0CG7rrtXlZE/GUkrYqKSn/LdNNjGy9uxCrjcCkRUhzqV05HA ZaPa89IvkjBaKtLlfSeXg5hMj0jB4pQlgFtFdSlpG+R5jT9DH/SoMyNL8xT9jiQb0s77 T92egoPQ4HZD1AkqclOA1/4rKxpS3vbOaORVBXHIfDdZqcxBh0D/ZSQXDWlOrx6PHzs2 CVA972kPrIHgMmr3tXhBSULSe8CjTDXbbYd7cOT6HcQSH9nmPLJ5Du2ScRAuQ3kkw60j XfEA== X-Gm-Message-State: AOAM531Bio+RqldRaJviiTC/fS1KEozPKTsxrMMgWN4Yd46LBGOQQHE4 2etsWe5Z5N8e7B3cyXlFG6zGq1AC X-Google-Smtp-Source: ABdhPJym6jnROHFUb80UD4Yba3FcbjuJNaeXDOwIDiDUcP9kpjuhv2rHLeXNMNC2DKNhLAKlv7v6WA== X-Received: by 2002:adf:f8cc:: with SMTP id f12mr18395714wrq.418.1590957807590; Sun, 31 May 2020 13:43:27 -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 w10sm18728850wrp.16.2020.05.31.13.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:27 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:56 +0200 Message-Id: <20200531204257.18725-6-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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 (guix_get_bin_list)[BIN_VER]: Add missing curly-brackets, [latest_ver]: Likewise & add explicit 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 0e6e6842a1..7d635c2c38 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -210,7 +210,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 -oP "([0-9]{1,2}\.){2}[0-9]{1,2}" \ | tail -n1)" @@ -224,7 +224,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 31 20:42:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22481 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 3452C27BBE1; Sun, 31 May 2020 21:44: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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 A6A4A27BBE3 for ; Sun, 31 May 2020 21:44:24 +0100 (BST) Received: from localhost ([::1]:51534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUoi-00077N-8Y for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoO-0006cr-Nu for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoO-0000qX-E9 for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoO-0007KF-CM for guix-patches@gnu.org; Sun, 31 May 2020 16:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 7/7] guix-install.sh: Add missing variable quoting & curly-bracketing in guix_get_bin(). Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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.159095783728098 (code B ref 40601); Sun, 31 May 2020 20:44:04 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:57 +0000 Received: from localhost ([127.0.0.1]:33942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUoH-0007J2-FR for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:57 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:42793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnu-0007HT-8j for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:34 -0400 Received: by mail-wr1-f53.google.com with SMTP id p5so3536544wrw.9 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:34 -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=hv+8YqkYTmG+yORQcwLz2eKJ/Qn3YqvC6SvnvPCUMFg=; b=IYh1p5s5xPD+xvlyusvFOm3e7sXr+fXOyFZHX0eQVWg+Ib5A9RlHURoVKcmaRZHgBF 16qM8rGQbRxqzpP8e0gnjJTIUgKD9YQTIQKcjG+SRD2LV6brvCmTXvni9VHP5b6jXbNU VsJNfM3vHbfx+j8jpZvOn/MiroH2dnwhscU56ZGGVCz3WBNO42F3OJpB3M7TApBS7jVp YBRZ1dMkjTNMQ5VpNlzM82mr3IWNR5v9vmTzJHRCoEoRjiR5OiFt6B8qCOX63hyN3iRC z0Kc+gBQe9tSu/kLOS9gt2uuN0gbbxpc+1hxCjT8ssnUS1ZJmDLGn/GTXfK5M4I7aG4g NJ/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=hv+8YqkYTmG+yORQcwLz2eKJ/Qn3YqvC6SvnvPCUMFg=; b=iRc0voX3RNcszswfEyZ8Ng0qkA5J8OHmYB9lXA0+QsJB3n/mDp7D1WADqnYUTSKuKi NnJ0GP4kkZKkfL+DsaG8Xb1CA/8NxqQ2a4TXYRL8IGIiJvB3Iv1xvbvZNA7UUKHyH+bG Nsyvez239ZGqP2N6ht9s39CWsxFIbux4yZyU1S+3TawJDEDQv4tc4w/1miVknn884u1E pC8P/94MzmvifRweCpKs+qUu5Yf8Da5aftj3Ofxx5KWiIjqKXi/EfSr4+INGDiTCnvZn 0uytBlQtS4EGfMzPaSvv4qP5BesP1Gs9yhoiRSAaYwGlFOF2fyErdS9uP/BNAWWoREUX E7vA== X-Gm-Message-State: AOAM531h+MPsgomebOwF7HNGJzi2UQzQ7MfUphwroJrMkab61JUOA1H3 lP0D0FxuUvdXFO2sK7fn7jGAG9o1 X-Google-Smtp-Source: ABdhPJxWBg56N5V3YMxPvgUHwKTdsetH4aq4i6bz7gFttyewgsweK2nAEjdZ+pnDF0lyq8wJnTs7bA== X-Received: by 2002:adf:a50e:: with SMTP id i14mr6932528wrb.21.1590957808521; Sun, 31 May 2020 13:43:28 -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 w10sm18728850wrp.16.2020.05.31.13.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:28 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:57 +0200 Message-Id: <20200531204257.18725-7-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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 (guix_get_bin)[dl_path]: Add missing variable quoting and curly-bracketing, [_PROGRESS_OPT]: Likewise. --- etc/guix-install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7d635c2c38..f0d4a38838 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -239,7 +239,8 @@ 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." @@ -248,7 +249,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."