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