From: Daniel Brooks <db48x@db48x.net>
To: 44657@debbugs.gnu.org
Subject: [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version
Date: Sun, 15 Nov 2020 08:39:26 -0800 [thread overview]
Message-ID: <87k0um4ls1.fsf@db48x.net> (raw)
[-- Attachment #1: [PATCH] guix-install.sh: don't throw away release candidates when --]
[-- Type: text/x-patch, Size: 1781 bytes --]
From 6d4e4bb8b61b2095b6d2ac9691184a9c478ae8b5 Mon Sep 17 00:00:00 2001
From: Daniel Brooks <db48x@db48x.net>
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 <me@tobias.gr>
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
#
# 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
next reply other threads:[~2020-11-15 16:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 16:39 Daniel Brooks [this message]
2020-11-15 17:05 ` [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version zimoun
2020-11-15 17:25 ` Daniel Brooks
2020-11-15 20:44 ` bug#44657: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k0um4ls1.fsf@db48x.net \
--to=db48x@db48x.net \
--cc=44657@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).