diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh index f33fbcb66..0014cc7c2 100755 --- a/home.admin/99updateMenu.sh +++ b/home.admin/99updateMenu.sh @@ -421,10 +421,7 @@ Do you really want to update Bitcoin Core now? error="" warn="" - source <(sudo -u admin /home/admin/config.scripts/bitcoin.update.sh tested) - if [ ${#error} -gt 0 ]; then - whiptail --title "ERROR" --msgbox "${error}" 8 30 - fi + sudo -u admin /home/admin/config.scripts/bitcoin.update.sh tested /home/admin/config.scripts/blitz.shutdown.sh reboot ;; RECKLESS) diff --git a/home.admin/config.scripts/bitcoin.update.sh b/home.admin/config.scripts/bitcoin.update.sh index 991d555dc..f6b5e1468 100755 --- a/home.admin/config.scripts/bitcoin.update.sh +++ b/home.admin/config.scripts/bitcoin.update.sh @@ -16,13 +16,13 @@ fi # 1. parameter [info|tested|reckless] mode="$1" -# RECOMMENDED UPDATE BY RASPIBLITZ TEAM +# RECOMMENDED UPDATE BY RASPIBLITZ TEAM (just possible once per sd card update) # comment will be shown as "BEWARE Info" when option is choosen (can be multiple lines) -bitcoinVersion="" # example: 22.0 .. keep empty if no newer version as sd card build is available +bitcoinVersion="24.1" # example: 22.0 .. keep empty if no newer version as sd card build is available # needed to check code signing -# https://github.com/sipa.gpg -fallbackSigner=sipa +# https://github.com/emzy.gpg +fallbackSigner=Emzy # GATHER DATA # setting download directory to the current user @@ -148,17 +148,18 @@ if [ "${mode}" = "tested" ] || [ "${mode}" = "reckless" ] || [ "${mode}" = "cust mkdir -p "${downloadDir}" cd "${downloadDir}" || exit 1 - echo "# Enter the github username of a signer. Find the list of signers at: " - echo "https://github.com/bitcoin-core/guix.sigs/tree/main/${pathVersion}" - echo "# Example for Peter Wuille (https://github.com/sipa):" - echo "sipa" - echo "# example for Emzy (https://github.com/Emzy):" - echo "Emzy" - read customSigner - - if [ ${#customSigner} -eq 0 ]; then - customSigner=$fallbackSigner - fi + # NOTE: this script is run by provision and cannot have user input at this point or it will lock up the provision process + # echo "# Enter the github username of a signer. Find the list of signers at: " + # echo "https://github.com/bitcoin-core/guix.sigs/tree/main/${pathVersion}" + # echo "# Example for Peter Wuille (https://github.com/sipa):" + # echo "sipa" + # echo "# example for Emzy (https://github.com/Emzy):" + # echo "Emzy" + # read customSigner + # if [ ${#customSigner} -eq 0 ]; then + # customSigner=$fallbackSigner + # fi + customSigner=$fallbackSigner echo "# Download the binary sha256 hash sum file" wget -O all.SHA256SUMS https://raw.githubusercontent.com/bitcoin-core/guix.sigs/main/${pathVersion}/${customSigner}/all.SHA256SUMS