Skip to content
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.

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

Additional User Input Flags 2 #37

Merged
merged 4 commits into from
Apr 24, 2023

Conversation

rougegoat
Copy link
Contributor

As requested over in my last PR, here's a new one that adds the option to disable the Username value. I think I held off on that initially because of the possibility of a trailing comma if certain combinations were disabled. I've reworked it a bit to ensure that there won't be trailing comma in any combination of prompts. You should now be able to enable or disable all of the ones on the Welcome page without breaking the next steps.

I also went ahead and made it so that if the Configuration prompt is disabled it also removes mention of configurations from the Welcome text.

I think this will be my last PR before the next official release assuming everything works as expected.

Add ability to disable the prompts for Username and Configuration.  Can now disable all user input if desired.
If the Configuration prompt is disabled, remove that information from the welcomeMessage variable
Re-order the promptFor__ toggles to match the order they appear in the Welcome screen.
attempting to fix a conflict
@dan-snelson
Copy link
Collaborator

Thanks again, @rougegoat.

I'm now observing a CONFLICT (content): Merge conflict in Setup-Your-Mac-via-Dialog.bash when attempting to merge; I think we were both making updates.

Will you please resubmit?

@dan-snelson dan-snelson self-assigned this Apr 24, 2023
@dan-snelson dan-snelson added this to the 1.10.0 milestone Apr 24, 2023
@dan-snelson
Copy link
Collaborator

@rougegoat: Actually, will you please give me a few minutes to add some local fixes?

@dan-snelson
Copy link
Collaborator

@rougegoat: I just pushed 1.10.0-rc23; thanks so much.

@rougegoat
Copy link
Contributor Author

I have rebuilt using rc-23, and that looks to have fixed the conflict.

@dan-snelson dan-snelson merged commit d49402b into setup-your-mac:development Apr 24, 2023
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