From a6a15dc834dc71e385257473d0f4ca6eb0d1ba18 Mon Sep 17 00:00:00 2001
From: qlrd <106913782+qlrd@users.noreply.github.com>
Date: Sat, 9 Sep 2023 15:38:32 -0300
Subject: [PATCH] Recognizing Armbian system and  fixing "Bitcoin Install
 Fails" on Armbian (#4157)

* Update build_sdcard.sh

OrangePi5 was not recognized in line ~255; so recognize it by same 'Debian' method, replacing by 'Armbian'

* Update bitcoin.install.sh

Bitcoin Install Fails during build_sdcard.sh due to PGP key download; see https://github.com/raspiblitz/raspiblitz/issues/3753. Comment it by now

* Update bitcoin.install.sh

changed to secure hkps

* Update home.admin/config.scripts/bitcoin.install.sh

These comments are not needed here. The sole purpose was to describe the move to a PR.

Co-authored-by: openoms <43343391+openoms@users.noreply.github.com>

* Update build_sdcard.sh

Modified the request by OpenOMS where the comments are unnecessary and kept Debian as the first option and moved Armbian down the list as an elif.

---------

Co-authored-by: openoms <43343391+openoms@users.noreply.github.com>
---
 build_sdcard.sh                              | 2 ++
 home.admin/config.scripts/bitcoin.install.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_sdcard.sh b/build_sdcard.sh
index e91e690f4..f3f04c3ab 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -255,6 +255,8 @@ if [ $(cat /etc/os-release 2>/dev/null | grep -c 'Debian') -gt 0 ]; then
   fi
 elif [ $(cat /etc/os-release 2>/dev/null | grep -c 'Ubuntu') -gt 0 ]; then
   baseimage="ubuntu"
+elif [ $(cat /etc/os-release 2>/dev/null | grep -c 'Armbian') -gt 0 ]; then
+  baseimage="armbian"
 else
   echo "\n# FAIL: Base Image cannot be detected or is not supported."
   cat /etc/os-release 2>/dev/null
diff --git a/home.admin/config.scripts/bitcoin.install.sh b/home.admin/config.scripts/bitcoin.install.sh
index adb08f7e9..2323d2521 100644
--- a/home.admin/config.scripts/bitcoin.install.sh
+++ b/home.admin/config.scripts/bitcoin.install.sh
@@ -27,7 +27,7 @@ if [ "$1" = "install" ]; then
   cd /home/admin/download || exit 1
 
   # receive signer key
-  if ! gpg --keyserver hkp://keyserver.ubuntu.com --recv-key "71A3 B167 3540 5025 D447 E8F2 7481 0B01 2346 C9A6"
+  if ! gpg --keyserver hkps://keys.openpgp.org --recv-key "71A3 B167 3540 5025 D447 E8F2 7481 0B01 2346 C9A6"
   then
     echo "# FAIL # Couldn't download Wladimir J. van der Laan's PGP pubkey"
     exit 1