From 4a902f5d0ee0d34ced02a3b18a4d9dd6ec9e53eb Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 23 Apr 2020 09:06:07 +0200 Subject: update --- README | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/README b/README index 0d93eeb..8173f9a 100755 --- a/README +++ b/README @@ -9,26 +9,6 @@ set -e -########################################################## -# # -# check and possibly install root-certificate of jeti100 # -# # -########################################################## - -if ! curl -o /dev/null "https://jeti100.ioq.uni-jena.de/" 2> /dev/null -then - cert="$(curl "http://jeti100.ioq.uni-jena.de/statisch/ca.crt" 2> /dev/null)" - if ! echo "${cert}" | \ - sha512sum | \ - grep -q "^c1a9da72183ef6fd87deb506dd93ea3e6247d28ec0720914c97a80369e9e81cb7e9f7ce37fe063756880eb84f402fec20ccb3c2c4fb46f5f707a022f803372be -\$" - then - >&2 echo 'falsches CA-Zertifikat heruntergeladen' - exit 1 - fi - echo "${cert}" > /usr/share/ca-certificates/trust-source/anchors/jeti100.crt - trust extract-compat -fi - ################ # # # import keys: # @@ -46,7 +26,7 @@ rm -f "${tmpFile}" # # ############################ -pacman-key --lsign-key 0x43BF68D3 +pacman-key --lsign-key 5FDCA472AB93292BC678FD59255A76DB9A12601A ############################### # # @@ -54,7 +34,7 @@ pacman-key --lsign-key 0x43BF68D3 # # ############################### -pacman-key --lsign-key 0x20194BA1 +pacman-key --lsign-key F8028D351891AE15970A2B3B3CFB0AD8F60030F8 ############################## # # @@ -67,11 +47,11 @@ then ml="$( curl "https://arch.eckner.net/archlinuxewe/os/any/" 2> /dev/null | \ tr "<>" "\n\n" | \ - grep "^pacman-mirrorlist-.*\.pkg\.tar\.xz\$" | \ + grep "^pacman-mirrorlist-.*\.pkg\.tar\.zst\$" | \ tail -n1 )" curl "https://arch.eckner.net/archlinuxewe/os/any/${ml}" 2> /dev/null | \ - tar -OxJ etc/pacman.d/mirrorlist > \ + tar -Ox --zstd etc/pacman.d/mirrorlist > \ /etc/pacman.d/mirrorlist fi -- cgit v1.2.3-54-g00ecf