civodul pushed a commit to branch version-1.2.0
in repository guix.
commit 207c3c594e22b678ddcea8ebc78f19b839612187
Author: Daniel Brooks <[email protected]>
AuthorDate: Sun Nov 15 08:38:14 2020 -0800
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
Signed-off-by: Ludovic Courtès <[email protected]>
---
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 7f0dd00..f0a1550 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -6,6 +6,7 @@
# Copyright © 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
# Copyright © 2020 Morgan Smith <[email protected]>
# Copyright © 2020 Simon Tournier <[email protected]>
+# Copyright © 2020 Daniel Brooks <[email protected]>
#
# 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}"
