Skip to content

Update MerlinAU.sh#118

Merged
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev
Feb 10, 2024
Merged

Update MerlinAU.sh#118
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev

Conversation

@Martinski4GitHub
Copy link
Collaborator

  • Fixed trap statement.
  • Additional check made in the "email notification" setup.
  • Fixed the "find" command statement to get the "Changelog-*.txt" file of the firmware to be flashed.
    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.
  • Double-quoting variables & assignment statements per coding standard.

- 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.

keepZIPfile=0
trap "_DoCleanUp_ 0 "$keepZIPfile" ; _DoExit_ 0" HUP INT QUIT ABRT TERM
trap '_DoCleanUp_ 0 "$keepZIPfile" ; _DoExit_ 0' HUP INT QUIT ABRT TERM
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So clean, so nice. Approved!

@ExtremeFiretop ExtremeFiretop merged commit ab46101 into ExtremeFiretop:dev Feb 10, 2024
@ExtremeFiretop
Copy link
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!
But that was just because today was a last moment squeeze in, next time we go back to dev in dev changes I promise haha!

@ExtremeFiretop ExtremeFiretop added bug Something isn't working enhancement New feature or request labels Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants