Merged
Conversation
- Fixed trap statement. - Additional check in "email notification" setup. - Fixed the "find" statement to get the Changelog file of the firmware to be flashed. - Double-quoting variables & assignment statements per coding standard.
ExtremeFiretop
approved these changes
Feb 10, 2024
|
|
||
| keepZIPfile=0 | ||
| trap "_DoCleanUp_ 0 "$keepZIPfile" ; _DoExit_ 0" HUP INT QUIT ABRT TERM | ||
| trap '_DoCleanUp_ 0 "$keepZIPfile" ; _DoExit_ 0' HUP INT QUIT ABRT TERM |
Owner
There was a problem hiding this comment.
I see what you mean, great catch, went straight over my eyes multiple times!
| #Files matching the patterns 'Changelog-NG.txt' or 'Changelog-386.txt' | ||
| changelog_file=$(find ${FW_BIN_DIR} -type f \( -name "Changelog-386.txt" -o -name "Changelog-NG.txt" \) -print | head -n 1) | ||
| # Files matching the pattern 'Changelog-*.txt' # | ||
| changelog_file="$(/usr/bin/find -L "${FW_BIN_DIR}" -name "Changelog-*.txt" -print | head -n 1)" |
Owner
There was a problem hiding this comment.
So clean, so nice. Approved!
Owner
|
This was clean, tested and merged! Because it was only going to dev, it auto-synced right up to my PR for main, super slick! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The previous statement used the "-type" argument which is not valid with the built-in "find" command. It's valid with the Entware "find" utility which not all users may have installed.