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 "