2.0

Macjutsu · Sep 2, 2022 · ad1495a · ad1495a
1 parent c9973ff
commit ad1495a
Show file tree

Hide file tree

Showing 37 changed files with 420 additions and 592 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## [2.0]
+
+2022-09-02
+
+- The [S.U.P.E.R.M.A.N. Wiki](https://github.com/Macjutsu/super/wiki) is finally helpful!
+- Detailed help removed from within the `super` script, because...
+- If there is a current GUI user the `--help` option now automatically opens the [S.U.P.E.R.M.A.N. Wiki](https://github.com/Macjutsu/super/wiki). If there is no current GUI user this option shows basic usage.
+- Spellcheck! So. Many. Typos.
+
 ## [2.0rc1]
 
 2022-08-23
@@ -25,15 +34,15 @@
 
 2022-06-16
 
-- There are so many new features in `super` 2.x that any existing scripts, Configuration Profiles, or other workflows designed for `super` 1.x are not compatible with `super` 2.x. Plese review `sudo super --help` in addition to this change log!
+- There are so many new features in `super` 2.x that any existing scripts, Configuration Profiles, or other workflows designed for `super` 1.x are not compatible with `super` 2.x. Please review `sudo super --help` in addition to this change log!
 - All option flags with a variable value now require the use of equals ( = ). For example, `--default-defer=3600`. However, quoting is no longer required for option variables (unless they use a reserved character like "space").
 - When running `super` via Jamf Pro Policy, you can now use script Parameter Values for configuration. However, you can only use one option per Parameter Value, so you are limited to a total of 8 options with this method. Obviously, you should consider using a [Configuration Profile](https://github.com/Macjutsu/super/blob/main/All_Managed_Options_com.macjutsu.super.plist) for setting more options.
 - New `--recheck-defer=seconds` option allows `super` to re-run on a regular basis even when no Apple software updates are found. Thus, `super` "remains active" to enforce ongoing Apple software update checking.
 - Significantly updated deferral mechanism now allows for all deadline types (focus, soft, and hard) for all deferral types, including...
 - New `--focus-days=number`, `--soft-days=number`, and `--hard-days=number` options allow you specify a maximum number of days to defer after an Apple software update is found.
 - New `--zero-day=YYYY-MM-DD:hh:mm` option allows you to specify a manual day zero instead of relying on the default automatic zero day, which is based on when new Apple system updates are available.
 - Maximum deferral count and maximum deferral days deadlines can now be restarted with the `--restart-count` and `--restart-days` options.
-- Multiple options of a simliar type can now be deleted with a single option, this includes; `--delete-deferrals`, `--delete-counts`, `--delete-days`, `--delete-dates`, and `--delete-accounts`.
+- Multiple options of a similar type can now be deleted with a single option, this includes; `--delete-deferrals`, `--delete-counts`, `--delete-days`, `--delete-dates`, and `--delete-accounts`.
 - Improved icon scaling when using the `--icon-size-ibm` option courtesy of...
 - IBM Notifier [Version 2.7.1 Build 81](https://github.com/IBM/mac-ibm-notifications/releases/tag/v-2.7.1-b-81) is automatically downloaded and installed in the $superFOLDER.
 - As a default behavior, the `--policy-triggers` option now waits for restart-required system updates to become available before running any Jamf Policy Triggers. Alternately, you can combine this option with the `--skip-updates` option to run the Jamf Policy triggers without waiting for a restart-required system update.

diff --git a/Log Examples/mdm.log → Example-Logs/mdm.log b/Log Examples/mdm.log → Example-Logs/mdm.log
diff --git a/Log Examples/super.log → Example-Logs/super.log b/Log Examples/super.log → Example-Logs/super.log
diff --git a/Log Examples/update.log → Example-Logs/update.log b/Log Examples/update.log → Example-Logs/update.log
diff --git a/Example-MDM/All-Options-Example-DO-NOT-DEPLOY-com.macjutsu.super.mobileconfig b/Example-MDM/All-Options-Example-DO-NOT-DEPLOY-com.macjutsu.super.mobileconfig
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1">
+  <dict>
+    <key>PayloadUUID</key>
+    <string>FB94ECBE-26E5-4408-AB95-5A94D71F8158</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadOrganization</key>
+    <string>Macjutsu</string>
+    <key>PayloadIdentifier</key>
+    <string>FB94ECBE-26E5-4408-AB95-5A94D71F8158</string>
+    <key>PayloadDisplayName</key>
+    <string>S.U.P.E.R.M.A.N. All Settings Example</string>
+    <key>PayloadDescription</key>
+    <string>This configures settings the super update script. This is an example showing all possible settings AND SHOULD NOT BE DEPLOYED AS IS.</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+    <key>PayloadEnabled</key>
+    <true/>
+    <key>PayloadRemovalDisallowed</key>
+    <true/>
+    <key>PayloadScope</key>
+    <string>System</string>
+    <key>PayloadContent</key>
+    <array>
+      <dict>
+        <key>PayloadDisplayName</key>
+        <string>Custom Settings</string>
+        <key>PayloadIdentifier</key>
+        <string>48FAD646-0792-4724-9167-6C1FE182F33A</string>
+        <key>PayloadOrganization</key>
+        <string>Macjutsu</string>
+        <key>PayloadType</key>
+        <string>com.apple.ManagedClient.preferences</string>
+        <key>PayloadUUID</key>
+        <string>48FAD646-0792-4724-9167-6C1FE182F33A</string>
+        <key>PayloadVersion</key>
+        <integer>1</integer>
+        <key>PayloadContent</key>
+        <dict>
+          <key>com.macjutsu.super</key>
+          <dict>
+            <key>Forced</key>
+            <array>
+              <dict>
+                <key>mcx_preference_settings</key>
+                <dict>
+                  <key>DefaultDefer</key>
+                  <string>120</string>
+                  <key>DisplayIcon</key>
+                  <string>/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BurningIcon.icns</string>
+                  <key>DisplayRedraw</key>
+                  <string>20</string>
+                  <key>DisplayTimeout</key>
+                  <string>60</string>
+                  <key>FocusCount</key>
+                  <string>5</string>
+                  <key>FocusDate</key>
+                  <string>2022-07-01</string>
+                  <key>FocusDays</key>
+                  <string>2</string>
+                  <key>FocusDefer</key>
+                  <string>120</string>
+                  <key>ForceRestart</key>
+                  <true/>
+                  <key>HardCount</key>
+                  <string>5</string>
+                  <key>HardDate</key>
+                  <string>2022-07-03:03:03</string>
+                  <key>HardDays</key>
+                  <string>6</string>
+                  <key>IconSizeIbm</key>
+                  <string>128</string>
+                  <key>IconSizeJamf</key>
+                  <string>128</string>
+                  <key>JamfProID</key>
+                  <string>$JSSID</string>
+                  <key>MenuDefer</key>
+                  <string>120,200,300</string>
+                  <key>PolicyTriggers</key>
+                  <string>trigger1,trigger2</string>
+                  <key>PreferJamf</key>
+                  <false/>
+                  <key>RecheckDefer</key>
+                  <string>120</string>
+                  <key>SkipUpdates</key>
+                  <true/>
+                  <key>SoftCount</key>
+                  <string>5</string>
+                  <key>SoftDate</key>
+                  <string>2022-07-02:02</string>
+                  <key>SoftDays</key>
+                  <string>4</string>
+                  <key>TestMode</key>
+                  <true/>
+                  <key>TestModeTimeout</key>
+                  <string>15</string>
+                  <key>VerboseMode</key>
+                  <true/>
+                  <key>ZeroDay</key>
+                  <string>2022-07-01</string>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </dict>
+      </dict>
+    </array>
+  </dict>
+</plist>
diff --git a/All_Managed_Options_com.macjutsu.super.plist → ...le-DO-NOT-DEPLOY-com.macjutsu.super.plist b/All_Managed_Options_com.macjutsu.super.plist → ...le-DO-NOT-DEPLOY-com.macjutsu.super.plist
diff --git a/Example-MDM/Apple-Software-Update-Disable-Notifications.mobileconfig b/Example-MDM/Apple-Software-Update-Disable-Notifications.mobileconfig
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1">
+  <dict>
+    <key>PayloadUUID</key>
+    <string>CDB0BC64-F3EB-4B1A-AA5E-9A5D994CA592</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadOrganization</key>
+    <string>Macjutsu</string>
+    <key>PayloadIdentifier</key>
+    <string>CDB0BC64-F3EB-4B1A-AA5E-9A5D994CA592</string>
+    <key>PayloadDisplayName</key>
+    <string>Apple Software Update Disable Notifications</string>
+    <key>PayloadDescription</key>
+    <string>These settings disable the Apple software update notifications and banners.</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+    <key>PayloadEnabled</key>
+    <true/>
+    <key>PayloadRemovalDisallowed</key>
+    <true/>
+    <key>PayloadScope</key>
+    <string>System</string>
+    <key>PayloadContent</key>
+    <array>
+      <dict>
+        <key>PayloadDisplayName</key>
+        <string>Notifications Payload</string>
+        <key>PayloadIdentifier</key>
+        <string>84DB38D0-8A4B-4382-B1D2-11235122FF6D</string>
+        <key>PayloadOrganization</key>
+        <string>Macjutsu</string>
+        <key>PayloadType</key>
+        <string>com.apple.notificationsettings</string>
+        <key>PayloadUUID</key>
+        <string>84DB38D0-8A4B-4382-B1D2-11235122FF6D</string>
+        <key>PayloadVersion</key>
+        <integer>1</integer>
+        <key>NotificationSettings</key>
+        <array>
+          <dict>
+            <key>BundleIdentifier</key>
+            <string>_system_center_:com.apple.softwareupdatenotification</string>
+            <key>CriticalAlertEnabled</key>
+            <false/>
+            <key>NotificationsEnabled</key>
+            <false/>
+          </dict>
+        </array>
+      </dict>
+      <dict>
+        <key>PayloadDisplayName</key>
+        <string>Custom Settings</string>
+        <key>PayloadIdentifier</key>
+        <string>87E2F5E4-1C8A-4D43-AA52-676364A3326E</string>
+        <key>PayloadOrganization</key>
+        <string>Macjutsu</string>
+        <key>PayloadType</key>
+        <string>com.apple.ManagedClient.preferences</string>
+        <key>PayloadUUID</key>
+        <string>87E2F5E4-1C8A-4D43-AA52-676364A3326E</string>
+        <key>PayloadVersion</key>
+        <integer>1</integer>
+        <key>PayloadContent</key>
+        <dict>
+          <key>com.apple.systempreferences</key>
+          <dict>
+            <key>Forced</key>
+            <array>
+              <dict>
+                <key>mcx_preference_settings</key>
+                <dict>
+                  <key>AttentionPrefBundleIDs</key>
+                  <integer>0</integer>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </dict>
+      </dict>
+    </array>
+  </dict>
+</plist>
diff --git a/Example-MDM/Jamf-Pro-ID-Only-Example-com.macjutsu.super.mobileconfig b/Example-MDM/Jamf-Pro-ID-Only-Example-com.macjutsu.super.mobileconfig
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1">
+  <dict>
+    <key>PayloadUUID</key>
+    <string>C70AFE28-6CB4-467D-99E6-AE5F2C5E4716</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadOrganization</key>
+    <string>Macjutsu</string>
+    <key>PayloadIdentifier</key>
+    <string>C70AFE28-6CB4-467D-99E6-AE5F2C5E4716</string>
+    <key>PayloadDisplayName</key>
+    <string>S.U.P.E.R.M.A.N. Jamf Pro ID Only Example</string>
+    <key>PayloadDescription</key>
+    <string>This sends the computer's Jamf Pro ID for use by the super update script.</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+    <key>PayloadEnabled</key>
+    <true/>
+    <key>PayloadRemovalDisallowed</key>
+    <true/>
+    <key>PayloadScope</key>
+    <string>System</string>
+    <key>PayloadContent</key>
+    <array>
+      <dict>
+        <key>PayloadDisplayName</key>
+        <string>Custom Settings</string>
+        <key>PayloadIdentifier</key>
+        <string>F4B5AEAE-4579-4C62-A95E-2645ADA76815</string>
+        <key>PayloadOrganization</key>
+        <string>Macjutsu</string>
+        <key>PayloadType</key>
+        <string>com.apple.ManagedClient.preferences</string>
+        <key>PayloadUUID</key>
+        <string>F4B5AEAE-4579-4C62-A95E-2645ADA76815</string>
+        <key>PayloadVersion</key>
+        <integer>1</integer>
+        <key>PayloadContent</key>
+        <dict>
+          <key>com.macjutsu.super</key>
+          <dict>
+            <key>Forced</key>
+            <array>
+              <dict>
+                <key>mcx_preference_settings</key>
+                <dict>
+                  <key>JamfProID</key>
+                  <string>$JSSID</string>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+        </dict>
+      </dict>
+    </array>
+  </dict>
+</plist>
diff --git a/JamfPro_ID_Only_com.macjutsu.super.plist → ...-ID-Only-Example-com.macjutsu.super.plist b/JamfPro_ID_Only_com.macjutsu.super.plist → ...-ID-Only-Example-com.macjutsu.super.plist
diff --git a/Example-MDM/Recommended-Apple-Software-Update-Settings.mobileconfig b/Example-MDM/Recommended-Apple-Software-Update-Settings.mobileconfig
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1">
+  <dict>
+    <key>PayloadUUID</key>
+    <string>11F60840-A42D-4D5E-BCA7-44C4AEC4F7C9</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadOrganization</key>
+    <string>Macjutsu</string>
+    <key>PayloadIdentifier</key>
+    <string>11F60840-A42D-4D5E-BCA7-44C4AEC4F7C9</string>
+    <key>PayloadDisplayName</key>
+    <string>Apple Software Update Settings</string>
+    <key>PayloadDescription</key>
+    <string>These settings disable the automatic download and installation of system updates but enable the automatic installation of all other software update types.</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+    <key>PayloadEnabled</key>
+    <true/>
+    <key>PayloadRemovalDisallowed</key>
+    <true/>
+    <key>PayloadScope</key>
+    <string>System</string>
+    <key>PayloadContent</key>
+    <array>
+      <dict>
+        <key>PayloadUUID</key>
+        <string>85671462-39F4-47E4-9C48-AF2F4D9266EB</string>
+        <key>PayloadType</key>
+        <string>com.apple.SoftwareUpdate</string>
+        <key>PayloadOrganization</key>
+        <string>Macjutsu</string>
+        <key>PayloadIdentifier</key>
+        <string>85671462-39F4-47E4-9C48-AF2F4D9266EB</string>
+        <key>PayloadDisplayName</key>
+        <string>Software Update</string>
+        <key>PayloadDescription</key>
+        <string/>
+        <key>PayloadVersion</key>
+        <integer>1</integer>
+        <key>PayloadEnabled</key>
+        <true/>
+        <key>CatalogURL</key>
+        <string/>
+        <key>AutomaticallyInstallAppUpdates</key>
+        <true/>
+        <key>AutomaticallyInstallMacOSUpdates</key>
+        <false/>
+        <key>AutomaticCheckEnabled</key>
+        <true/>
+        <key>AutomaticDownload</key>
+        <false/>
+        <key>ConfigDataInstall</key>
+        <true/>
+        <key>CriticalUpdateInstall</key>
+        <true/>
+      </dict>
+    </array>
+  </dict>
+</plist>
diff --git a/Example-MDM/Super-Service-Account-Jamf-Pro-PPPC.mobileconfig b/Example-MDM/Super-Service-Account-Jamf-Pro-PPPC.mobileconfig
diff --git a/Images/CountDialog.png b/Images/CountDialog.png
diff --git a/Images/DaysDateDialog.png b/Images/DaysDateDialog.png
diff --git a/Images/DefaultDeferDialog.png b/Images/DefaultDeferDialog.png
diff --git a/Images/DisplayIcon.png b/Images/DisplayIcon.png
diff --git a/Images/DisplayTimeout.png b/Images/DisplayTimeout.png
diff --git a/Images/HardCountNotification.png b/Images/HardCountNotification.png
diff --git a/Images/HardDateNotification.png b/Images/HardDateNotification.png
diff --git a/Images/HardDaysNotification.png b/Images/HardDaysNotification.png
diff --git a/Images/InstallingTerminal.png b/Images/InstallingTerminal.png
diff --git a/Images/JamfProCustomConfigProfile.png b/Images/JamfProCustomConfigProfile.png
diff --git a/Images/JamfProIDConfigProfile.png b/Images/JamfProIDConfigProfile.png
diff --git a/Images/JamfProPPPCConfigProfile1.png b/Images/JamfProPPPCConfigProfile1.png
diff --git a/Images/JamfProPPPCConfigProfile2.png b/Images/JamfProPPPCConfigProfile2.png
diff --git a/Images/JamfProPolicy.png b/Images/JamfProPolicy.png
diff --git a/Images/JamfProUserPrivileges.png b/Images/JamfProUserPrivileges.png
diff --git a/Images/MenuDeferDialog.png b/Images/MenuDeferDialog.png
diff --git a/...ots/NotificationsConfigurationProfile.png → Images/NotificationsConfigurationProfile.png b/...ots/NotificationsConfigurationProfile.png → Images/NotificationsConfigurationProfile.png
diff --git a/Screenshots/Restart.png → Images/RestartExample.png b/Screenshots/Restart.png → Images/RestartExample.png
diff --git a/Images/SelfUpdateExample.png b/Images/SelfUpdateExample.png
diff --git a/Images/SoftCountDialog.png b/Images/SoftCountDialog.png
diff --git a/Images/SoftDateDialog.png b/Images/SoftDateDialog.png
diff --git a/Images/SoftDaysDialog.png b/Images/SoftDaysDialog.png
diff --git a/Images/TestModeTerminal.png b/Images/TestModeTerminal.png
diff --git a/Screenshots/Ask.png → Images/UpdateExample.png b/Screenshots/Ask.png → Images/UpdateExample.png