Allow user the opportunity to connect to AC power, plus others

ryangball commented 5 years ago

Most of my users will read the instructions, and still run the policy even though AC power is not connected. This PR allows a user to connect to AC power within a specified time period, and will automatically continue once AC power is connected. Also, when a system requirement is not met, the jamfHelper will display the EXACT system requirement that is not met, rather than a list of which ones might not be met. Additionally, it does not make sense to me to continue downloading the installer and creating files on the system if those requirements are not met, so this PR will exit if the system requirements are not met, thus the users time is not wasted and actions are not taken when not necessary.

Here is a list of some things included:

Allows the user a specified time period to connect to AC power before quitting
Automatically detect that AC power is connected during the specified time period
Exits if system requirements are not met, so that the users time is not wasted doing the other tasks like downloading the installer
Displays the EXACT system requirement that is not met, rather than giving showing them both which might not be accurate
Uses system icons for some jamfHelper dialogs as the icon in the OS Installer might not be present if the installer does not exist locally
Moved clean up tasks to the cleanExit function and suppress errors if the caffeinatePID is not found or any scripts do not exist

ryangball commented 5 years ago

Sorry, I should have squashed the two commits.

kenchan0130 commented 5 years ago

@ryangball Thank you for your patches. Good job! Could you fix the conflict as well?

ryangball commented 5 years ago

@kenchan0130 Conflicts should be resolved now. Let me know if you have any other questions. Thanks!

kenchan0130 commented 5 years ago

LGTM! Thank you for your help.

kc9wwh / macOSUpgrade

Allow user the opportunity to connect to AC power, plus others #115