From 5db920fd8bdb238fa8cb23b6584efd94d701cdcd Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:53:30 +0100
Subject: [PATCH] Update install.sh

---
 src/install.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index d22c845..540c68d 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -439,11 +439,6 @@ updateImage() {
   return 0
 }
 
-capture () {
-    typeset var captured; captured="$1"; shift
-    { read $captured <<<$( { { "$@" ; } 1>&3 ; } 2>&1); } 3>&1
-}
-
 buildImage() {
 
   local dir="$1"
@@ -468,22 +463,29 @@ buildImage() {
     return 1
   fi
 
+  local log="/run/shm/iso.log"
+  local hide="Warning: creating filesystem that does not conform to ISO-9660."
+
   if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 
-    if ! capture error genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
-                                 -udf -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -allow-limited-size -quiet "$dir"; then
+    if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
+                                 -udf -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -allow-limited-size -quiet "$dir" 2> "$log"; then
       return 1
     fi
 
   else
 
-    if ! capture error genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 2 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
-                                 -udf -allow-limited-size -quiet  "$dir"; then
+    if !  genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 2 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
+                                 -udf -allow-limited-size -quiet  "$dir" 2> "$log"; then
       return 1
     fi
 
   fi
 
+  error=$(<"$log")
+  echo "$error"
+  rm -f "$log"
+
   if [ -f "$STORAGE/$BASE" ]; then
     error "File $STORAGE/$BASE does already exist?!"
     return 1