Dev 1.0.3 Target as Next Stable Release#117
Conversation
Resync with Main
Update Readme for Dev
Martinski4GitHub
left a comment
Martinski4GitHub
left a comment
There was a problem hiding this comment.
Looks good to go.
|
Okay I fixed/addressed the issue brought up here: https://www.snbforums.com/threads/introducing-merlinau-the-ultimate-firmware-auto-updater-addon.88577/post-891658 In Commit: 4ecfef0 and I am going to wait for your review because I did have a drink or two tonight and you may have a better way to match the files. (Thats why it's 2 commits after all) But I tested this method though and it works! :) Also addressed BACKUPMON nvram differently, I moved BACKUPMON before the blink function starts, so it doesn't pause midway through the blink cycle. Tested and it works as well! Have a goodnight buddy. Much love! |
- 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.
MerlinAU.sh
Outdated
| # Define the path to the log file | ||
| changelog_file="${FW_BIN_DIR}/Changelog-NG.txt" | ||
| #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) |
There was a problem hiding this comment.
The "find" cmd statement uses 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. Also, I prefer to search for the pattern "Changelog-*.txt" which will find possible future changes in the name such as "Changelog-388.txt" in addition to current file names.
I fixed the "find" cmd statement in my PR because it was using an argument that is not valid with the built-in "find" command. See my comment for more details.
Sounds good. |
Oh buddy this is why I wait for you! Let me test this and review, on the surface not only does it look better but it just makes more freaking sense your way! 🤣 |
Update MerlinAU.sh
|
That was super slick, because your PR was merged before mine into dev , my PR just picked up yours and updates/syncs the changes. I was thinking about conflicts but I'm syncing into main instead of dev so, zero conflicts! |
|
Yep, tested fully now, your changes make me much more comfortable merging this in. @Martinski4GitHub moving forwards it's back to dev to dev changes first, this one was just a bit of a last moment squeeze in! |
2 participants
@Martinski4GitHub
Dev 1.0.3 Target as Next Stable Release