Skip to content

Update MerlinAU.sh-Redirect-Unzip-Output #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 2 commits into from
Feb 19, 2024
Merged

Update MerlinAU.sh-Redirect-Unzip-Output #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06b832c
Update MerlinAU.sh-Redirect-Unzip-Output
ExtremeFiretop Feb 19, 2024
2fb402e
Update MerlinAU.sh
ExtremeFiretop Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
###################################################################
set -u

readonly SCRIPT_VERSION=1.0.4
readonly SCRIPT_VERSION=1.0.5
readonly SCRIPT_NAME="MerlinAU"

##-------------------------------------##
Expand Down Expand Up @@ -2780,16 +2780,18 @@ 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_)"
Say "Required RAM: ${required_space_kb} KB - RAM Free: ${freeRAM_kb} KB - RAM Available: ${availableRAM_kb} KB"
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.
Expand All @@ -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
#-------------------------------------------------------------#
Expand Down