setup-your-mac / Setup-Your-Mac

Setup Your Mac aims to simplify initial device configuration by leveraging swiftDialog and Jamf Pro Policy Custom Events to allow end-users to self-complete Mac setup post-enrollment.
https://snelson.us/sym
MIT License
231 stars 52 forks source link

Added Variables for Prefill Email and Computer Name #145

Closed AndrewMBarnett closed 1 month ago

AndrewMBarnett commented 3 months ago
dan-snelson commented 3 months ago

Thanks for the PR, @AndrewMBarnett.

If this does merged, it'd be included in version 1.15.0.

I just changed the base branch and now there are conflicts; please review.

AndrewMBarnett commented 3 months ago

Hi @dan-snelson.

For the conflicts, are you wanting me to add my changes to the files listed with conflicts? Just want to make sure I resolve the correct conflicts.

dan-snelson commented 3 months ago

Sorry for any Dan-induced confusion, Andrew; please just add your changes to Setup-Your-Mac-via-Dialog.bash.

AndrewMBarnett commented 2 months ago

Hey Dan, I don't know if I have access to add anything?

Is this what you are looking for or are do you want the actual script edits?

Version 1.15.0, 02-Apr-2024

- Added variables for prefill Email and Computer Name Fields for the Welcome dialog screen (thanks, @AndrewMBarnett)Pull Request No. 145

#

dan-snelson commented 1 month ago

Greetings, @AndrewMBarnett!

Will you please pull the 1.15.0 branch a re-re-submit only Setup-Your-Mac-via-Dialog.bash one last time ?

(If it still doesn't behave, I can manually add your changes, but I'm not enough of a git Ninja-Jedi to give you the deserved credit.)

Thanks.

dan-snelson commented 1 month ago

@AndrewMBarnett:

Your changes have been included in 1.15.0-b12.

Thanks.