From b90a3bcb850c4f9c8e9271033a0e69749e3079ca Mon Sep 17 00:00:00 2001 From: Taylor Helsper Date: Fri, 1 Jan 2021 19:33:22 -0600 Subject: [PATCH] Fix pool installation --- rootfs/standard/usr/bin/mynode_post_upgrade.sh | 5 +++-- setup/setup_device.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index 1dc053e7..b51b0df1 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -59,6 +59,7 @@ fi set +e curl https://keybase.io/roasbeef/pgp_keys.asc | gpg --import curl https://keybase.io/bitconner/pgp_keys.asc | gpg --import +curl https://keybase.io/guggero/pgp_keys.asc | gpg --import # Pool curl https://raw.githubusercontent.com/JoinMarket-Org/joinmarket-clientserver/master/pubkeys/AdamGibson.asc | gpg --import gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 01EA5486DE18A882D4C2684590C8019E36C2E964 curl https://keybase.io/suheb/pgp_keys.asc | gpg --import @@ -293,7 +294,7 @@ if [ $IS_X86 = 1 ]; then fi POOL_UPGRADE_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/$POOL_ARCH-$POOL_VERSION.tar.gz POOL_UPGRADE_MANIFEST_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt -POOL_UPGRADE_MANIFEST_SIG_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt.sig +POOL_UPGRADE_MANIFEST_SIG_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt.asc CURRENT="" if [ -f $POOL_VERSION_FILE ]; then CURRENT=$(cat $POOL_VERSION_FILE) @@ -308,7 +309,7 @@ if [ "$CURRENT" != "$POOL_VERSION" ]; then wget $POOL_UPGRADE_MANIFEST_URL wget $POOL_UPGRADE_MANIFEST_SIG_URL - gpg --verify manifest-*.txt.sig + gpg --verify manifest-*.txt.asc if [ $? == 0 ]; then # Install Pool tar -xzf pool-*.tar.gz diff --git a/setup/setup_device.sh b/setup/setup_device.sh index 3b4b6827..e18974ca 100755 --- a/setup/setup_device.sh +++ b/setup/setup_device.sh @@ -108,6 +108,7 @@ fi # Import Keys curl https://keybase.io/roasbeef/pgp_keys.asc | gpg --import curl https://keybase.io/bitconner/pgp_keys.asc | gpg --import +curl https://keybase.io/guggero/pgp_keys.asc | gpg --import # Pool curl https://raw.githubusercontent.com/JoinMarket-Org/joinmarket-clientserver/master/pubkeys/AdamGibson.asc | gpg --import gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 01EA5486DE18A882D4C2684590C8019E36C2E964 curl https://keybase.io/suheb/pgp_keys.asc | gpg --import