diff --git a/strap.sh b/strap.sh index 0cacb26..c0002bb 100755 --- a/strap.sh +++ b/strap.sh @@ -67,10 +67,10 @@ check_internet() fetch_keyring() { curl -s -O \ - 'https://aur.draggane.com/x86_64/condorcore-keyring-20230903-2-any.pkg.tar.zst' + 'https://aur.centauricorex.net/x86_64/condorcore-keyring-20231117-1-any.pkg.tar.zst' curl -s -O \ - 'https://aur.draggane.com/x86_64/condorcore-keyring-20230903-2-any.pkg.tar.zst.sig' + 'https://aur.centauricorex.net/x86_64/condorcore-keyring-20231117-1-any.pkg.tar.zst.sig' } # verify the keyring signature @@ -78,13 +78,13 @@ fetch_keyring() verify_keyring() { if ! gpg --keyserver keyserver.ubuntu.com \ - --recv-keys 597244DBEA52EC6EFE5F36A4FDD42A59FD43C07B > /dev/null 2>&1 + --recv-keys 2B9D22B41F2AF1042BFCE73A3CA0B9DF1BE7CE09 > /dev/null 2>&1 then if ! gpg --keyserver hkps://keyserver.ubuntu.com:443 \ - --recv-keys 597244DBEA52EC6EFE5F36A4FDD42A59FD43C07B > /dev/null 2>&1 + --recv-keys 2B9D22B41F2AF1042BFCE73A3CA0B9DF1BE7CE09 > /dev/null 2>&1 then if ! gpg --keyserver keys.openpgp.org \ - --recv-keys 597244DBEA52EC6EFE5F36A4FDD42A59FD43C07B > /dev/null 2>&1 + --recv-keys 2B9D22B41F2AF1042BFCE73A3CA0B9DF1BE7CE09 > /dev/null 2>&1 then err "could not verify the key." fi @@ -92,7 +92,7 @@ verify_keyring() fi if ! gpg --keyserver-options no-auto-key-retrieve \ - --with-fingerprint condorcore-keyring-20230903-2-any.pkg.tar.zst.sig > /dev/null 2>&1 + --with-fingerprint condorcore-keyring-20231117-1-any.pkg.tar.zst.sig > /dev/null 2>&1 then err "invalid keyring signature." fi @@ -101,8 +101,8 @@ verify_keyring() # delete the signature files delete_signature() { - if [ -f "condorcore-keyring-20230903-2-any.pkg.tar.zst.sig" ]; then - rm condorcore-keyring-20230903-2-any.pkg.tar.zst.sig + if [ -f "condorcore-keyring-20231117-1-any.pkg.tar.zst.sig" ]; then + rm condorcore-keyring-20231117-1-any.pkg.tar.zst.sig fi } @@ -116,7 +116,7 @@ check_pacman_gnupg() install_keyring() { if ! pacman --config /dev/null --noconfirm \ - -U condorcore-keyring-20230903-2-any.pkg.tar.zst ; then + -U condorcore-keyring-20231117-1-any.pkg.tar.zst ; then err 'keyring installation failed' fi