From ea7298bcbc983ef1807b1c2ecd0de295c08669c6 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sat, 28 May 2022 16:24:58 +0200
Subject: [PATCH] Make the innoextract rule more obvious, robust and less
 repeated

---
 Descriptions.txt |  4 ++--
 Makefile         | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Descriptions.txt b/Descriptions.txt
index 16a8de9..549d5ba 100644
--- a/Descriptions.txt
+++ b/Descriptions.txt
@@ -233,8 +233,8 @@ j4uj75wd.iso  sha1:3ff5025a4a5f62f461467f7726e5b2c1fa119b5b L440, L540 BIOS 1.93
 # - update the tools to automatically determine the FAT_OFFSET
 
 # The firmware files from inside the ISO images
-b590.H9ET92WW.CAP rule:CAP,dep:h9et92ww.exe,depi:h9et92ww.exe.bat;g3uj13us.iso.orig;h9et75ww.zip.orig,param:H9ET92WW.CAP;g3uj13us.iso;h9et75ww.zip  b590 BIOS H9ET75WW Flash File
-b580.h1et73ww.s0AH1000.EXE  rule:EXE,dep:h1uj53us.exe,depi:h1uj53us.exe.bat1;g3uj13us.iso.orig,param:\\$$0AH1000.FL1;g3uj13us.iso  b580 BIOS H1ET73WW Flash File
+b590.H9ET92WW.CAP           rule:CAP,dep:h9et92ww.exe,depi:h9et92ww.exe.bat;g3uj13us.iso.orig;h9et75ww.zip.orig,param:H9ET92WW.CAP;g3uj13us.iso;h9et75ww.zip  b590 BIOS H9ET75WW Flash File
+b580.h1et73ww.s0AH1000.EXE  rule:EXE,dep:h1uj53us.exe,depi:h1uj53us.exe.bat1;g3uj13us.iso.orig,param:\$$0AH1000.FL1;g3uj13us.iso  b580 BIOS H1ET73WW Flash File
 e330.H3EC35WW.s01H3000.FL1  rule:FL2,dep:h3uj76wd.iso,depi:h3uj76wd.iso.bat1;h3uj52wd.iso.orig,param:01H3000.FL1;h3uj52wd.iso e330 BIOS 1.16 Flash File
 l430.G3HT40WW.s01D4000.FL1  rule:FL2,dep:g3uj13us.iso,depi:g3uj13us.iso.bat1,param:01D4000.FL1 l430 BIOS 2.54 Flash File
 l440.J4HT27WW.s0AJ4000.FL1  rule:FL2,dep:j4uj62wd.iso,param:0AJ4000.FL1                        l440 BIOS 1.73 Flash File
diff --git a/Makefile b/Makefile
index fcbee99..f80c765 100644
--- a/Makefile
+++ b/Makefile
@@ -423,14 +423,17 @@ rule_FL2_insert_DEPS = scripts/ISO_copyFL2 # TODO - bat file
 # $< is the EXE file
 # $1 is the pattern to match CAP file in EXE file
 define rule_CAP_extract
-    mv `innoextract $< -I $(1) | grep -i $(1) | cut -d'"' -f2` $@
+    innoextract $< -I $(1) -d tmp.inno
+    mv `find tmp.inno -type f` $@
+    touch $@
+    rm -rf tmp.inno
 endef
-rule_CAP_extract_DEPS = # add innoextract as dependency here?
+rule_CAP_extract_DEPS = # no extra local dependancies
 
 define rule_EXE_extract
-    mv `innoextract $< -I $(1) | grep -i $(1) | cut -d'"' -f2` $@
+    $(call rule_CAP_extract,$1)
 endef
-rule_EXE_extract_DEPS = # add innoextract as dependency here?
+rule_EXE_extract_DEPS = # no extra local dependancies
 
 # Create a new ISO image with patches applied
 # This is specifically for B590 firmware where we have to combine a bootable DOS