From e4107c4815b14990011ad5e9b94bb6968d9c883f Mon Sep 17 00:00:00 2001
From: Frede H <fh@manjaro.org>
Date: Tue, 14 Jan 2025 07:42:44 +0000
Subject: [PATCH] update script

---
 manjaro-arm-installer | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 64facc0..9d85a0d 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -2,7 +2,7 @@
 
 # Set globals
 # *****************************
-VERSION="1.5.3"
+VERSION="1.5.4"
 # *****************************
 TMPDIR=/var/tmp/manjaro-arm-installer
 ARCH='aarch64'
@@ -69,12 +69,13 @@ for i in "${DEPENDENCIES[@]}"; do
 done
 
 if [[ "$CARCH" != "aarch64" ]]; then
-if [ ! -f "/usr/lib/binfmt.d/qemu-aarch64-static.conf" ]; then
-    echo "qemu-aarch64-static.conf file is missing. Please install the relevant package."
-    exit 1
+    if [ ! -f "/usr/lib/binfmt.d/qemu-aarch64-static.conf" ]; then
+        echo "qemu-aarch64-static.conf file is missing. Please install the relevant package."
+        exit 1
+    fi
+    # restart systemd-binfmt on x86_64
+    systemctl restart systemd-binfmt
 fi
-fi
-
 
 # Functions
 msg() {
@@ -157,7 +158,7 @@ create_install() {
     $NSPAWN $TMPDIR/root pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
     
     info "Setting target branch ${BRANCH}..."
-    sed -i 's|.*Branch.*|Branch = '${BRANCH}'|g' $TMPDIR/root/etc/pacman-mirrors.conf
+    sed -i 's|.*Branch =.*|Branch = '${BRANCH}'|g' $TMPDIR/root/etc/pacman-mirrors.conf
 
     info "Generating mirrorlist..."
     $NSPAWN $TMPDIR/root pacman-mirrors -f10 1> /dev/null 2>&1
@@ -299,7 +300,7 @@ create_install() {
     rm -f $TMPDIR/root/usr/bin/qemu-aarch64-static
     rm -f $ROOTFS_IMG/rootfs_$ARCH/MANJARO-ARM-IMAGE-BUILD
     rm -f $TMPDIR/root/var/cache/pacman/pkg/*
-    rm -f $TMPDIR/root/var/log/*
+    rm -rf $TMPDIR/root/var/log/*
     rm -rf $ROOTFS_IMG/rootfs_$ARCH/var/log/journal/*
     rm -f $TMPDIR/root/etc/*.pacnew
     rm -f $TMPDIR/root/usr/lib/systemd/system/systemd-firstboot.service