Skip to content

Commit 6fa7c48

Browse files
authored
Merge pull request #11 from jamf/develop-2.0.0-fgd-changes
Develop 2.0.0 Branch for @fgd changes
2 parents f0bd638 + 75c7822 commit 6fa7c48

File tree

4 files changed

+467
-167
lines changed

4 files changed

+467
-167
lines changed

CHANGELOG.md

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,64 @@
11
# Change Log
22

3+
## [2.0.0] - 2018/12/10
4+
5+
Moved to new version release as this release does not have backwards compatibility for older versions of DEPNotify. Please review the new [RELEASES.md](RELEASES.md) page for more information.
6+
7+
* Added [RELEASES.md](RELEASES.md) page to track versions of script app and macOS that have been tested together
8+
* Made small modifications to the [README.md](README.md) page to alert admins to new page
9+
* Separated configurable variables into small chunks by use. Required configurations are closer to the top with more niche options closer to the bottom of the configuration area
10+
* Removed `SUPPORT_URL` as newer version does not support
11+
* Added `STATUS_TEXT_ALIGN`
12+
* Added `HELP_BUBBLE_TITLE`
13+
* Added `HELP_BUBBLE_BODY`
14+
* `DEP_NOTIFY_INFO_PLIST` changed to `DEP_NOTIFY_USER_INPUT_PLIST` as there is a new plist that stores all user input separate from configuration
15+
* EULA Enhancements
16+
* Added `EULA_MAIN_TITLE`
17+
* Added `EULA_STATUS`
18+
* Added `EULA_BUTTON`
19+
* Added `EULA_SUBTITLE`
20+
* Registration Enhancements
21+
* `REGISTER_ENABLED` changed to `REGISTRATION_ENABLED` to keep registration options similar
22+
* Added `REGISTRATION_STATUS`
23+
* `REGISTER_TITLE` changed to `REGISTRATION_TITLE` to keep registration options similar
24+
* `REGISTER_BEGIN_STATUS` changed to `REGISTRATION_BEGIN_WORD`
25+
* `REGISTER_MIDDLE_STATUS` changed to `REGISTRATION_MIDDLE_WORD`
26+
* First text box
27+
* `TEXT_UPPER_DISPLAY` changed to `REG_TEXT_LABEL_1`
28+
* `TEXT_UPPER_PLACEHOLDER` changed to `REG_TEXT_LABEL_1_PLACEHOLDER`
29+
* Added `REG_TEXT_LABEL_1_OPTIONAL`
30+
* Added code to allow for optional items to be skipped if empty
31+
* Added `REG_TEXT_LABEL_1_HELP_TITLE`
32+
* Added `REG_TEXT_LABEL_1_HELP_TEXT`
33+
* `TEXT_UPPER_LOGIC` changed to `REG_TEXT_LABEL_1_LOGIC`
34+
* `TEXT_UPPER_VALUE` changed to `REG_TEXT_LABEL_1_VALUE`
35+
* Second text box
36+
* `TEXT_LOWER_DISPLAY` changed to `REG_TEXT_LABEL_2`
37+
* `TEXT_LOWER_PLACEHOLDER` changed to `REG_TEXT_LABEL_2_PLACEHOLDER`
38+
* Added `REG_TEXT_LABEL_2_OPTIONAL`
39+
* Added code to allow for optional items to be skipped if empty
40+
* Added `REG_TEXT_LABEL_2_HELP_TITLE`
41+
* Added `REG_TEXT_LABEL_2_HELP_TEXT`
42+
* `TEXT_LOWER_LOGIC` changed to `REG_TEXT_LABEL_2_LOGIC`
43+
* `TEXT_LOWER_VALUE` changed to `REG_TEXT_LABEL_2_VALUE`
44+
* Popup 1
45+
* `PICK_UPPER_DISPLAY` changed to `REG_POPUP_LABEL_1`
46+
* `PICK_UPPER_OPTIONS` changed to `REG_POPUP_LABEL_1_OPTIONS`
47+
* Added `REG_POPUP_LABEL_1_HELP_TITLE`
48+
* Added `REG_POPUP_LABEL_1_HELP_TEXT`
49+
* `PICK_UPPER_LOGIC` changed to `REG_POPUP_LABEL_1_LOGIC`
50+
* `PICK_UPPER_VALUE` changed to `REG_POPUP_LABEL_1_VALUE`
51+
* Popup 2
52+
* `PICK_LOWER_DISPLAY` changed to `REG_POPUP_LABEL_2`
53+
* `PICK_LOWER_OPTIONS` changed to `REG_POPUP_LABEL_2_OPTIONS`
54+
* Added `REG_POPUP_LABEL_2_HELP_TITLE`
55+
* Added `REG_POPUP_LABEL_2_HELP_TEXT`
56+
* `PICK_LOWER_LOGIC` changed to `REG_POPUP_LABEL_2_LOGIC`
57+
* `PICK_LOWER_VALUE` changed to `REG_POPUP_LABEL_2_VALUE`
58+
* Added full code to support popup 3
59+
* Added full code to support popup 4
60+
* Modified code for ownership and permissions on plists within the user's library folder
61+
362
## [1.2.0] - 2018/11/01
463

564
Major enhancements and additions across the board by Kyle Bareis

README.md

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,37 @@
1-
# DEPNotify for Jamf Pro
1+
# DEPNotify Starter for Jamf Pro
22
Template bash script to start DEPNotify and run Policies during enrollment with Jamf. App installer, source code, and full product documentation can be found at: https://gitlab.com/Mactroll/DEPNotify
33

4-
![](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/fullscreen_setup.png)
4+
![](example-img/fullscreen_setup.png)
55

66
## General Information
77

8+
**Please review [RELEASES.md](RELEASES.md) to ensure proper version pairing of the script and DEPNotify app.**
9+
810
This script is designed to make implementation of DEPNotify very easy with limited scripting knowledge. The script has variables that may be modified to customize the end user experience. DO NOT modify things in or below the CORE LOGIC areas unless major testing and validation is performed.
911

1012
**This script is set to `TESTING_MODE` by default.**
1113

12-
There is a [warning alert box](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/fullscreen_testing_mode.png) that will show if `TESTING_MODE` is set to `true` in version 1.2.0 and newer. Having testing mode on will cause the following things to occur:
14+
There is a [warning alert box](example-img/fullscreen_testing_mode.png) that will show if `TESTING_MODE` is set to `true` in version 1.2.0 and later. Having testing mode on will cause the following things to occur:
1315

14-
* Sleep commands in place of running Policies or other things that may effect the device configuration
16+
* Sleep commands in place of running policies or other things that may effect the device configuration
1517
* Removal of BOM and configuration files
1618
* Command + Control + x is set to quit or interrupt DEPNotify
1719

18-
The script will need to be changed from `TESTING_MODE=true` to `TESTING_MODE=false` for polices to run as expected.
20+
The script will need to be changed from `TESTING_MODE=true` to `TESTING_MODE=false` for production deployment.
1921

20-
**It is recommended that you read the script fully and make changes that suit your organization prior to deployment to end user devices.**
22+
**It is recommended that you read the script fully and make changes that suit your organization prior to deployment to end user devices. Also, don't forget to test, test, and test again!**
2123

2224
## Configuration within Jamf Pro
2325

2426
While each organization will use a setup tool like DEPNotify differently, this script is designed with an end user provisioning model in mind. Changing the workflow should result in testing prior to production release.
2527

26-
1. [Create policies](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/jamfpro_policy_configuration.png) in Jamf Pro to install core software during first setup. Set the frequency to ongoing and the trigger to custom and type in a manual trigger. Screenshot below showing how a single policy is configured
27-
28+
1. [Create policies](example-img/jamfpro_policy_configuration.png) in Jamf Pro to install core software during first setup. Set the frequency to ongoing and the trigger to custom and type in a manual trigger. Screenshot below showing how a single policy is configured
2829
2. Once software policies are created, customize this script with changes to verbiage as well as updating the POLICY_ARRAY with appropriate information. Double check the testing flag once you are ready to proceed
29-
30-
* (Optional) If using the [EULA window](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/fullscreen_eula_user_input.png), there must be a .txt file saved somewhere locally prior to DEPNotify running. A by default, the script is looking in /Users/Shared for eula.txt
31-
32-
* (Optional) If using the [registration window](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/fullscreen_register_user_input.png), you must have the departments and buildings in Jamf prior to running DEPNotify on the client. Each text box or drop down has its own code so that it can be modified to suit individual needs. Make sure to test a bunch if the logic sections are changed
33-
30+
* (Optional) If using the [EULA window](example-img/fullscreen_eula_user_input.png), there must be a .txt file saved somewhere locally prior to DEPNotify running. A by default, the script is looking in /Users/Shared for eula.txt
31+
* (Optional) If using the [registration window](example-img/fullscreen_register_user_input.png), you must have the departments and buildings in Jamf prior to running DEPNotify on the client. Each text box or drop down has its own code so that it can be modified to suit individual needs. Make sure to test a bunch if the logic sections are changed
3432
3. Upload DEPNotify.pkg (downloaded from https://gitlab.com/Mactroll/DEPNotify/tags) and this script to Jamf Pro. Create a policy to install the PKG and this script using the Enrollment Complete trigger. Also set the execution frequency to ongoing
35-
3633
* (Optional) If using the EULA, add the EULA.pkg built in step 2 to this policy as well
37-
38-
* (Optional) [Policy parameters](https://github.com/jamfprofessionalservices/DEP-Notify/blob/master/example-img/jamfpro_policy_parameter_values.png) can be used to configure true/false flags to make testing features easier
39-
34+
* (Optional) [Policy parameters](example-img/jamfpro_policy_parameter_values.png) can be used to configure true/false flags to make testing features easier
4035
4. Once a computer is finished enrolling, the DEPNotify policy will start and then call the other policies in order based on the array.
4136

4237
#### FileVault Support
@@ -47,14 +42,9 @@ If you are requiring FileVault encryption, the script will automatically check a
4742

4843
For this script, verbose comments have been added to assist in configuration and understanding. For more information on DEPNotify, visit https://gitlab.com/Mactroll/DEPNotify
4944

50-
## Software Versions
51-
52-
The following versions were testing prior to being merged into the master branch. Please verify that you are using these versions prior to implementation.
45+
## Software Versions and Releases
5346

54-
* macOS 10.14.1
55-
* macOS 10.13.6
56-
* DEPNotify 1.1.2
57-
* Jamf Pro 10.8
47+
Software versions started to get rather cumbersome as versions of the script deviated from the app's version. Documentation of the script to app testing as well as macOS versions can now be found on the [RELEASES.md](RELEASES.md) file.
5848

5949
## Change Log
6050

RELEASES.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Releases and DEPNotify Versions
2+
3+
This page is to document version of the DEPNotify script in relation to the DEPNotify app. Script and app versions are independent of one another and can be confusing as releases continue.
4+
5+
## x.x.x of DEPNotify app
6+
Due to changes with menu.depnotify.plist, it was easier to update the script without backwards compatibility. As such v.2.0.0 of the script only supports this version of the app
7+
8+
##### App Download Link
9+
* DEPNotify x.x.x
10+
11+
##### Tested versions of DEPNotify.sh
12+
* [v2.0.0](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v2.0.0)
13+
14+
##### Tested versions of macOS
15+
* 10.14.1
16+
17+
## 1.1.2 of DEPNotify app
18+
Version 1.1.2 of DEPNotify added some key fixes for EULA and Registration window. When those were committed, v1.2.0 of DEPNotify.sh was released.
19+
20+
##### App Download Link
21+
* [DEPNotify 1.1.2 ](https://files.slack.com/files-pri/T04QVKUQG-FDURXEYUS/download/depnotify-1.1.2.zip)
22+
23+
##### Tested versions of DEPNotify.sh
24+
* [v1.2.0](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v1.2.0)
25+
26+
##### Tested versions of macOS
27+
* 10.14.0
28+
29+
## 1.1.0 of DEPNotify app
30+
Several updates to the script support version 1.1.0. Technically even 1.2.0 would work with 1.1.0 if not using EULA or Registration window. However, it is recommended that the latest version of the script is used that is compatible with the version of DEPNotify you are using.
31+
32+
##### App Download Link
33+
* [DEPNotify 1.1.0 ](https://gitlab.com/Mactroll/DEPNotify/uploads/bb828a261a0fdce50861031ffda3061d/DEPNotify-1.1.0.pkg)
34+
35+
##### Tested versions of DEPNotify.sh
36+
* [v1.1.2](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v1.1.2)
37+
* [v1.1.1](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v1.1.1)
38+
* [v1.1.0](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v1.1.0)
39+
* [v1.0.0](https://github.com/jamfprofessionalservices/DEPNotify/releases/tag/v1.0.0)
40+
41+
##### Tested versions of macOS
42+
* 10.14.0
43+
* 10.13.6

0 commit comments

Comments
 (0)