ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix-install.sh: don't throw away release candidates when picking the latest version

Browse source 
* etc/guix-install.sh (guix_get_bin_list): modify regexes to allow rcN syntax

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Daniel Brooks 2020-11-15 08:38:14 -08:00 committed by Ludovic Courtès
parent 31b6ad823b
commit 8311e4e1d1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
etc/guix-install.sh
View file

@ -6,6 +6,7 @@
# Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> # Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> # Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -60,6 +61,7 @@ INF="[ INFO ] "
DEBUG=0 DEBUG=0
GNU_URL="https://ftp.gnu.org/gnu/guix/" GNU_URL="https://ftp.gnu.org/gnu/guix/"
#GNU_URL="https://alpha.gnu.org/gnu/guix/"
OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
# This script needs to know where root's home directory is. However, we # 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 # Filter only version and architecture
bin_ver_ls=("$(wget -qO- "$gnu_url" \ 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)") | sort -Vu)")
latest_ver="$(echo "$bin_ver_ls" \ 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)" | tail -n1)"
default_ver="guix-binary-${latest_ver}.${ARCH_OS}" default_ver="guix-binary-${latest_ver}.${ARCH_OS}"