Skip to content

Minor Wording Cleanup#207

Merged
Martinski4GitHub merged 2 commits intodevfrom
ExtremeFiretop-Minor_Cleanup
May 10, 2024
Merged

Minor Wording Cleanup#207
Martinski4GitHub merged 2 commits intodevfrom
ExtremeFiretop-Minor_Cleanup

Conversation

@ExtremeFiretop
Copy link
Owner

Minor_Cleanup

Minor_Cleanup
@ExtremeFiretop
Copy link
Owner Author

ExtremeFiretop commented May 10, 2024

@Martinski4GitHub

So the change in wording for if it's a router or not:

       if "$inRouterSWmode" 
       then
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Update Email Notifications"
       else
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Email Notifications"
       fi

Was based on this SNB suggestion: https://www.snbforums.com/threads/merlinau-v1-1-2-the-ultimate-firmware-auto-updater-now-available-in-amtm.88577/post-902938

And then change of the logic to include:

        if [ "$inMenuMode" = true ]; then
            _WaitForEnterKey_ "$mainMenuReturnPromptStr"
            return 1
        else 
            _DoExit_ 1
        fi

Was only to match what I have on the Gnuton branch, tbh when I was doing the manual compare/sync between the two earlier today I couldn't tell which one was right/wrong or original/new.

If you think this is the wrong/incorrect logic let me know, and I can adjust Gnuton instead :)

@Martinski4GitHub
Copy link
Collaborator

@Martinski4GitHub

So the change in wording for if it's a router or not:

       if "$inRouterSWmode" 
       then
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Update Email Notifications"
       else
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Email Notifications"
       fi

Yes, the separate wording of the menu option is much better.

And then change of the logic to include:

        if [ "$inMenuMode" = true ]; then
            _WaitForEnterKey_ "$mainMenuReturnPromptStr"
            return 1
        else 
            _DoExit_ 1
        fi

See my review comment.

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub
So the change in wording for if it's a router or not:

       if "$inRouterSWmode" 
       then
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Update Email Notifications"
       else
           printf "\n ${GRNct}em${NOct}.  Toggle F/W Email Notifications"
       fi

Yes, the separate wording of the menu option is much better.

And then change of the logic to include:

        if [ "$inMenuMode" = true ]; then
            _WaitForEnterKey_ "$mainMenuReturnPromptStr"
            return 1
        else 
            _DoExit_ 1
        fi

See my review comment.

Adjusted in commit: 3c34530

@ExtremeFiretop
Copy link
Owner Author

I'll do the same for the Gnuton branch then! :)
Thanks for your review.

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub

Gnuton's been made to match in commit: 3a540a9

@Martinski4GitHub Martinski4GitHub merged commit ab49984 into dev May 10, 2024
@ExtremeFiretop ExtremeFiretop deleted the ExtremeFiretop-Minor_Cleanup branch May 10, 2024 10:30
@ExtremeFiretop ExtremeFiretop changed the title Minor_Cleanup Minor Wording Cleanup May 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants