From patchwork Sun Nov 15 16:39:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Brooks X-Patchwork-Id: 25141 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 E51F827BBF5; Sun, 15 Nov 2020 16:40:30 +0000 (GMT) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id 5747F27BBF4 for ; Sun, 15 Nov 2020 16:40:30 +0000 (GMT) Received: from localhost ([::1]:44016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keL4n-0007Fo-GD for patchwork@mira.cbaines.net; Sun, 15 Nov 2020 11:40:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keL4M-0007Dp-4W for guix-patches@gnu.org; Sun, 15 Nov 2020 11:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1keL4L-0001ey-PW for guix-patches@gnu.org; Sun, 15 Nov 2020 11:40:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1keL4L-0007OV-NG for guix-patches@gnu.org; Sun, 15 Nov 2020 11:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version Resent-From: Daniel Brooks Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Nov 2020 16:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44657 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44657@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches List Received: via spool by submit@debbugs.gnu.org id=B.160545838228393 (code B ref -1); Sun, 15 Nov 2020 16:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2020 16:39:42 +0000 Received: from localhost ([127.0.0.1]:54023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keL3y-0007Nn-Bv for submit@debbugs.gnu.org; Sun, 15 Nov 2020 11:39:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:59666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keL3u-0007Nc-Tm for submit@debbugs.gnu.org; Sun, 15 Nov 2020 11:39:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keL3u-0006fQ-GH for guix-patches@gnu.org; Sun, 15 Nov 2020 11:39:34 -0500 Received: from smtp-out-4.mxes.net ([2605:d100:2f:10::315]:10677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keL3r-0001UH-3n for guix-patches@gnu.org; Sun, 15 Nov 2020 11:39:34 -0500 Received: from Customer-MUA (mua.mxes.net [10.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.mxes.net (Postfix) with ESMTPSA id A87F0759C0 for ; Sun, 15 Nov 2020 11:39:27 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mxes.net; s=mta; t=1605458368; bh=btWt5FYpoy9Gffo8FSW9Bym8op4dz/VfXSNGS/ft9PM=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=pEDWDWX5rKxekNor5n25b1Qd03frJKYivXRzzNt0JBNxImbZg3NKdV5vsK/2htujc nhFVLEHZ5dFVmnSxB/j256t3nw+FmTyBajTzuOiOmBaF2p2kZ7p6QNV71P4E1M4aXy qD2My5eaXTrCKTU0GFI1Npgh1o4aONVwwAdrrFrw= From: Daniel Brooks Date: Sun, 15 Nov 2020 08:39:26 -0800 Message-ID: <87k0um4ls1.fsf@db48x.net> MIME-Version: 1.0 Content-Disposition: inline; filename=0001-guix-install.sh-don-t-throw-away-release-candidates-.patch Content-Description: [PATCH] guix-install.sh: don't throw away release candidates when X-Sent-To: Received-SPF: none client-ip=2605:d100:2f:10::315; envelope-from=db48x@db48x.net; helo=smtp-out-4.mxes.net X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From 6d4e4bb8b61b2095b6d2ac9691184a9c478ae8b5 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Sun, 15 Nov 2020 08:38:14 -0800 Subject: [PATCH] guix-install.sh: don't throw away release candidates when picking the latest version * etc/guix-install.sh (guix_get_bin_list): modify regexes to allow rcN syntax --- etc/guix-install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7f0dd00e53..f0a1550a74 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -6,6 +6,7 @@ # Copyright © 2019, 2020 Tobias Geerinckx-Rice # Copyright © 2020 Morgan Smith # Copyright © 2020 Simon Tournier +# Copyright © 2020 Daniel Brooks # # This file is part of GNU Guix. # @@ -60,6 +61,7 @@ INF="[ INFO ] " DEBUG=0 GNU_URL="https://ftp.gnu.org/gnu/guix/" +#GNU_URL="https://alpha.gnu.org/gnu/guix/" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" # This script needs to know where root's home directory is. However, we @@ -228,11 +230,11 @@ guix_get_bin_list() # Filter only version and architecture bin_ver_ls=("$(wget -qO- "$gnu_url" \ - | sed -n -e 's/.*guix-binary-\([0-9.]*\)\..*.tar.xz.*/\1/p' \ + | sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \ | sort -Vu)") latest_ver="$(echo "$bin_ver_ls" \ - | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}" \ + | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}[a-z0-9]*" \ | tail -n1)" default_ver="guix-binary-${latest_ver}.${ARCH_OS}" -- 2.26.2