From 06b832ce7e99559a7cb014ae6230ba40bf457042 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sun, 18 Feb 2024 22:44:17 -0500 Subject: [PATCH 1/2] Update MerlinAU.sh-Redirect-Unzip-Output Redirect UnzipOutput to the logs. --- MerlinAU.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index fd6d5b04..b4a5adac 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -2788,8 +2788,10 @@ Please manually update to version $minimum_supported_version or higher to use th check_memory_and_prompt_reboot "$required_space_kb" "$availableRAM_kb" # Extracting the firmware binary image # - if unzip -o "$FW_ZIP_FPATH" -d "$FW_BIN_DIR" -x README* - then + if output=$(unzip -o "$FW_ZIP_FPATH" -d "$FW_BIN_DIR" -x README* 2>&1); then + echo "$output" | while IFS= read -r line; do + Say "$line" + done #---------------------------------------------------------------# # Check if ZIP file was downloaded to a USB-attached drive. # Take into account special case for Entware "/opt/" paths. @@ -2798,7 +2800,6 @@ Please manually update to version $minimum_supported_version or higher to use th then # It's not on a USB drive, so it's safe to delete it # rm -f "$FW_ZIP_FPATH" - # elif ! _ValidateUSBMountPoint_ "$FW_ZIP_BASE_DIR" then #-------------------------------------------------------------# From 2fb402e7c9756cb83aaf35f93b02b96dcccf23dd Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sun, 18 Feb 2024 23:59:14 -0500 Subject: [PATCH 2/2] Update MerlinAU.sh --- MerlinAU.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index b4a5adac..71175830 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -8,7 +8,7 @@ ################################################################### set -u -readonly SCRIPT_VERSION=1.0.4 +readonly SCRIPT_VERSION=1.0.5 readonly SCRIPT_NAME="MerlinAU" ##-------------------------------------## @@ -2780,7 +2780,7 @@ Please manually update to version $minimum_supported_version or higher to use th fi ##------------------------------------------## - ## Modified by ExtremeFiretop [2024-Jan-22] ## + ## Modified by ExtremeFiretop [2024-Feb-18] ## ##------------------------------------------## freeRAM_kb="$(get_free_ram)" availableRAM_kb="$(_GetAvailableRAM_KB_)"