From 53a887a003b3e80d7ab0f90025beafedffd27ab9 Mon Sep 17 00:00:00 2001
From: Paul Philippov <themactep@gmail.com>
Date: Wed, 23 Nov 2022 08:57:21 -0500
Subject: [PATCH] Fix falling back to old flash type detection (#579)

---
 general/overlay/usr/sbin/sysupgrade | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index 08e7fd14..995ff8a6 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -3,7 +3,7 @@
 # OpenIPC.org | v.20221118
 #
 
-scr_version=1.0.14
+scr_version=1.0.15
 
 args=" $@"
 
@@ -80,10 +80,8 @@ do_wipe_overlay() {
 download_firmware() {
 	echo_c 33 "\nFirmware"
 	osr=$(get_system_build)
-	ftype=$(ipcinfo -F)
-	if $(echo ${ftype} | (! grep -qE 'nor|nand')); then
-		ftype=$(get_flash_type)
-	fi
+	ftype=$(ipcinfo -F 2>/dev/null)
+	[ ${#ftype} -gt 4 ] && ftype=$(get_flash_type)
 	build="${soc}-${ftype}-${osr}"
 	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
 	echo "Download from $url"