From ab356eab0738649ad5111cbf3d701a6836627bcc Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Thu, 22 Jun 2023 22:59:18 +0700
Subject: [PATCH] Update to umbrelOS 0.5.4 (#274)

---
 .github/workflows/on-push.yml      | 4 ++--
 config                             | 2 +-
 stage2/03-install-umbrel/01-run.sh | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index cc4fbab3..22a4336b 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
 jobs:
     build:
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         
         steps:
         
@@ -14,7 +14,7 @@ jobs:
           run: sudo apt-get update
 
         - name: Install dependencies
-          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+          run: sudo apt-get -y install quilt qemu-user-static debootstrap libarchive-tools
 
         - name: Nuke current Docker installation
           run: |
diff --git a/config b/config
index 55baa60e..dfa23fa1 100644
--- a/config
+++ b/config
@@ -6,4 +6,4 @@ FIRST_USER_PASS=moneyprintergobrrr
 ENABLE_SSH=1
 BUILD_SCRIPTS="Umbrel OS official build scripts"
 BUILD_SCRIPTS_REPO="https://github.com/getumbrel/umbrel-os"
-UMBREL_VERSION=0.5.3
+UMBREL_VERSION=0.5.4
diff --git a/stage2/03-install-umbrel/01-run.sh b/stage2/03-install-umbrel/01-run.sh
index a1f4acca..f2bb30c4 100755
--- a/stage2/03-install-umbrel/01-run.sh
+++ b/stage2/03-install-umbrel/01-run.sh
@@ -57,6 +57,11 @@ git clone ${UMBREL_REPO} .
 git checkout "${UMBREL_BRANCH}"
 fi
 
+# Download umbreld
+binary_url="https://github.com/getumbrel/umbrel/releases/download/v${UMBREL_VERSION}/umbreld-v${UMBREL_VERSION}-arm64.tar.gz"
+curl --fail --location "${binary_url}" | tar --extract --gzip --directory="./bin"
+
+
 # Enable Umbrel OS systemd services
 cd scripts/umbrel-os/services
 UMBREL_SYSTEMD_SERVICES=$(ls *.service)