* [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version
@ 2020-11-15 16:39 Daniel Brooks
2020-11-15 17:05 ` zimoun
2020-11-15 20:44 ` bug#44657: " Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Brooks @ 2020-11-15 16:39 UTC (permalink / raw)
To: 44657
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version
2020-11-15 16:39 [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version Daniel Brooks
@ 2020-11-15 17:05 ` zimoun
2020-11-15 17:25 ` Daniel Brooks
2020-11-15 20:44 ` bug#44657: " Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: zimoun @ 2020-11-15 17:05 UTC (permalink / raw)
To: Daniel Brooks, 44657
Hi,
Thank you for your patch.
On Sun, 15 Nov 2020 at 08:39, Daniel Brooks <db48x@db48x.net> wrote:
> DEBUG=0
> GNU_URL="https://ftp.gnu.org/gnu/guix/"
> +#GNU_URL="https://alpha.gnu.org/gnu/guix/"
> OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
Did you forget to remove the line you added for testing? I guess.
All the best,
simon
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version
2020-11-15 17:05 ` zimoun
@ 2020-11-15 17:25 ` Daniel Brooks
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Brooks @ 2020-11-15 17:25 UTC (permalink / raw)
To: zimoun; +Cc: 44657
zimoun <zimon.toutoune@gmail.com> writes:
> On Sun, 15 Nov 2020 at 08:39, Daniel Brooks <db48x@db48x.net> wrote:
>
>> DEBUG=0
>> GNU_URL="https://ftp.gnu.org/gnu/guix/"
>> +#GNU_URL="https://alpha.gnu.org/gnu/guix/"
>> OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
>
> Did you forget to remove the line you added for testing? I guess.
No, I just figured that leaving it there for the next person wouldn't
hurt. Keep it or remove it, whichever you prefer.
db48x
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#44657: [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version
2020-11-15 16:39 [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version Daniel Brooks
2020-11-15 17:05 ` zimoun
@ 2020-11-15 20:44 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2020-11-15 20:44 UTC (permalink / raw)
To: Daniel Brooks; +Cc: 44657-done
Hi,
Daniel Brooks <db48x@db48x.net> skribis:
>>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
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-15 20:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-15 16:39 [bug#44657] [PATCH] guix-install.sh: don't throw away release candidates when picking the laste version Daniel Brooks
2020-11-15 17:05 ` zimoun
2020-11-15 17:25 ` Daniel Brooks
2020-11-15 20:44 ` bug#44657: " Ludovic Courtès
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).