From 64ac5f2103a59f6040c2408b32e30844fd3db06b Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Sun, 17 Feb 2019 14:52:14 +0100
Subject: [PATCH 1/2] v6.22

+ DietPi-Software | Koel/MineOS: Fix install on ARMv8 systems, where "n" command explicitly requires "-a arm64"
---
 dietpi/dietpi-software | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index ad5c73be08..314565de17 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -5313,11 +5313,11 @@ _EOF_
 
 			Banner_Installing
 
-			#check folder is online
+			# Check folder is online
 			INSTALL_URL_ADDRESS='https://github.com/hexparrot/mineos-node.git'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
-			#prereqs
+			# Pre-reqs
 			G_AGI python python3 supervisor rdiff-backup screen rsync
 
 			mkdir -p $G_FP_DIETPI_USERDATA/mineos
@@ -5328,9 +5328,12 @@ _EOF_
 			git config core.filemode false
 			chmod +x service.js mineos_console.js generate-sslcert.sh webui.js
 
-			#Install Node 8, as MineOS is currently not compatible with Node 10
+			# Install Node 8, as MineOS is currently not compatible with Node 10: https://github.com/Fourdee/DietPi/issues/1880
 			npm i -g --unsafe-perm n
-			n 8
+			# - On ARMv8 explicitly add arch info, since it is not recognized by "n": https://github.com/Fourdee/DietPi/issues/1880#issuecomment-464097174
+			local arch=''
+			(( $G_HW_ARCH == 3 )) && arch='-a arm64'
+			n $arch 8
 
 			npm i --unsafe-perm
 
@@ -5758,7 +5761,10 @@ _EOF_
 
 			# Install pre-req yarn and "n" to downgrade to Node 8, as Node 10 is not (yet) compatible with Koel build.
 			npm i -g --unsafe-perm yarn n
-			n 8
+			# - On ARMv8 explicitly add arch info, since it is not recognized by "n": https://github.com/Fourdee/DietPi/issues/1880#issuecomment-464097174
+			local arch=''
+			(( $G_HW_ARCH == 3 )) && arch='-a arm64'
+			n $arch 8
 
 			# Download and install Composer:
 			php -r "readfile('https://getcomposer.org/installer');" > composer-setup.php

From 2fdcf8cc5d12337f204e13d1ae53c0709b7662eb Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Sun, 17 Feb 2019 14:57:02 +0100
Subject: [PATCH 2/2] v6.22

+ CHANGELOG | MineOS/Koel: Resolved an issue where install on ARMv8 devices failed
---
 CHANGELOG.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 16eb96bd8e..aae500e3d8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -11,6 +11,7 @@ Changes / Improvements / Optimisations:
 
 Bug Fixes:
 - General | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this: https://github.com/Fourdee/DietPi/issues/2529
+- DietPi-Software | MineOS/Koel: Resolved an issue where install on ARMv8 devices failed. Many thanks to @DeathIsUnknown for reporting this issue and solution: https://github.com/Fourdee/DietPi/issues/1880#issuecomment-464097174
 - DietPi-Software | Emby Server: We disabled the option to install it on Jessie ARM systems. This was never possible, since Debian Jessie does not provide the minimum required libc6 version. Thanks to @mbone for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5502
 - DietPi-Software | Mopidy: Resolved issue with failed audio playback. Many thanks to @arkhub for reporting this issue! https://github.com/Fourdee/DietPi/issues/2536
 - DietPi-Software | WireGuard: Resolved an issue with wrong client DNS entry, if on server 127.0.0.1/localhost loopback DNS entry is used. Thanks to @swrobel for reporting this issue: https://github.com/Fourdee/DietPi/issues/2482