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}"