From 7c3f3230ff1c87d1f03569812c7aa109355df155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Mon, 27 Dec 2021 14:32:36 +0100
Subject: [PATCH] buildscript: Split removal of chipset and subtarget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some OpenWrt targets do not have subtargets. The filename only contains
the chipset in that case. Split the removal of chipset and subtarget
into multiple expressions, so the removal of the chipset works on
targets without subtargets as well.

Fixes: #187

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
---
 buildscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildscript b/buildscript
index c719f597..51af6426 100755
--- a/buildscript
+++ b/buildscript
@@ -290,7 +290,8 @@ cp_firmware() {
             filename_build=${f##*/}
             filename_build=${filename_build//openwrt/fff-${version}}
             filename_build=${filename_build//squashfs-/}
-            filename_build=${filename_build//${chipset}-${subtarget}-/}
+            filename_build=${filename_build//${chipset}-/}
+            filename_build=${filename_build//${subtarget}-/}
             cp "$f" "$imagedestpath/$filename_build"
         done
     done