More Sequoia fixes (#15)

route1337 · Sep 23, 2024 · 5627e93 · 5627e93
1 parent b9d0dac
commit 5627e93
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@ Jamf Pro Scripts for macOS Management - Changelog
 ==============
 A list of all the changes made to this repo
 
+Version 0.1.11
+--------------
+
+1. Remove an unused `killall` command for the GPG Suite install script
+2. Remove a cask tap that's no longer needed for the Homebrew install script
+3. Update documentation to reflect moving from DEPNotify to Setup-Your-Mac
+
 Version 0.1.10
 --------------
 

diff --git a/README.md b/README.md
@@ -6,14 +6,14 @@ Scripts
 -------
 The following scripts are available in this repo
 
-| Script                                                              | Short Description                                               | DEP Required | macOS Versions Tested | Deployment Methods Supported                       |
-|---------------------------------------------------------------------|-----------------------------------------------------------------|--------------|-----------------------|----------------------------------------------------|
-| [Install Brave Browser](documentation/installBraveBrowser.md)       | Install The Brave Browser for the initial user                  | Yes          | 13.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
-| [Install Homebrew](documentation/installHomebrew.md)                | Install Homebrew for the initial user                           | Yes          | 12.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
-| [Common Homebrew Packages](documentation/commonHomebrewPackages.md) | Install common Homebrew brews and casks for the initial user    | Yes          | 12.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
-| [Install GPG Suite](documentation/installGPGSuite.md)               | Install GPG Suite for the initial user                          | Yes          | 12.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
-| [Configure Terminal](documentation/configureTerminal.md)            | Configure a custom zsh shell for the initial user               | Yes          | 12.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
-| [Configure ARD](documentation/configureARD.md)                      | Configure Apple Remote Desktop via Jamf API and local kickstart | Yes          | 12.1(AS)              | [DEPNotify](https://gitlab.com/Mactroll/DEPNotify) |
+| Script                                                              | Short Description                                               | DEP Required | macOS Versions Tested | Deployment Methods Supported                                       |
+|---------------------------------------------------------------------|-----------------------------------------------------------------|--------------|-----------------------|--------------------------------------------------------------------|
+| [Install Brave Browser](documentation/installBraveBrowser.md)       | Install The Brave Browser for the initial user                  | Yes          | 13.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
+| [Install Homebrew](documentation/installHomebrew.md)                | Install Homebrew for the initial user                           | Yes          | 12.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
+| [Common Homebrew Packages](documentation/commonHomebrewPackages.md) | Install common Homebrew brews and casks for the initial user    | Yes          | 12.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
+| [Install GPG Suite](documentation/installGPGSuite.md)               | Install GPG Suite for the initial user                          | Yes          | 12.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
+| [Configure Terminal](documentation/configureTerminal.md)            | Configure a custom zsh shell for the initial user               | Yes          | 12.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
+| [Configure ARD](documentation/configureARD.md)                      | Configure Apple Remote Desktop via Jamf API and local kickstart | Yes          | 12.1(AS)              | [Setup-Your-Mac](https://github.com/setup-your-mac/Setup-Your-Mac) |
 
 Extension Attributes
 --------------------

diff --git a/documentation/commonHomebrewPackages.md b/documentation/commonHomebrewPackages.md
@@ -1,6 +1,6 @@
 Jamf Pro Scripts for macOS Management - Install Common Homebrew Packages
 ==============
-This script runs during the post-DEP DEPNotify run and installs some common [Homebrew](https://brew.sh) brews and casks for the initially created user
+This script runs during the post-DEP Setup-Your-Mac run and installs some common [Homebrew](https://brew.sh) brews and casks for the initially created user
 
 Requirements
 ------------
@@ -11,9 +11,9 @@ macOS Compatibility Matrix
 ------------
 This script has been tested on the following macOS versions
 
-| Tested macOS Major Version               | Expected Working Minor Versions     | DEP Required |
-|------------------------------------------|-------------------------------------|--------------|
-| Monterey                                 | 12.1                                | Yes          |
+| Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
+|----------------------------|---------------------------------|--------------|
+| Sequoia                    | 15.0                            | Yes          |
 
 Script Operations
 ------------

diff --git a/documentation/configureARD.md b/documentation/configureARD.md
@@ -1,6 +1,6 @@
-Jamf Pro Scripts for macOS Management - Configure Terminal
+Jamf Pro Scripts for macOS Management - Configure ARD
 ==============
-This script runs during the post-DEP DEPNotify run and Configures Apple Remote Desktop via both the new mandatory API method
+This script runs during the post-DEP Setup-Your-Mac run and Configures Apple Remote Desktop via both the new mandatory API method
 and then via kickstart for customization
 
 Requirements
@@ -12,9 +12,9 @@ macOS Compatibility Matrix
 ------------
 This script has been tested on the following macOS versions
 
-| Tested macOS Major Version               | Expected Working Minor Versions     | DEP Required |
-|------------------------------------------|-------------------------------------|--------------|
-| Monterey                                 | 12.1                                | Yes          |
+| Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
+|----------------------------|---------------------------------|--------------|
+| Sequoia                    | 15.0                            | Yes          |
 
 API Permissions
 ---------------

diff --git a/documentation/configureTerminal.md b/documentation/configureTerminal.md
@@ -1,6 +1,6 @@
 Jamf Pro Scripts for macOS Management - Configure Terminal
 ==============
-This script runs during the post-DEP DEPNotify run and Configures the first user's Terminal with some custom settings
+This script runs during the post-DEP Setup-Your-Mac run and Configures the first user's Terminal with some custom settings
 
 Requirements
 ------------
@@ -11,9 +11,9 @@ macOS Compatibility Matrix
 ------------
 This script has been tested on the following macOS versions
 
-| Tested macOS Major Version               | Expected Working Minor Versions     | DEP Required |
-|------------------------------------------|-------------------------------------|--------------|
-| Monterey                                 | 12.1                                | Yes          |
+| Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
+|----------------------------|---------------------------------|--------------|
+| Sequoia                    | 15.0                            | Yes          |
 
 Script Operations
 ------------

diff --git a/documentation/installBraveBrowser.md b/documentation/installBraveBrowser.md
@@ -1,6 +1,6 @@
 Jamf Pro Scripts for macOS Management - Install Brave Browser
 ==============
-This script runs during the post-DEP DEPNotify run and installs [Brave](https://brave.com/) for the initially created user
+This script runs during the post-DEP Setup-Your-Mac run and installs [Brave](https://brave.com/) for the initially created user
 
 Requirements
 ------------
@@ -13,7 +13,7 @@ This script has been tested on the following macOS versions
 
 | Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
 |----------------------------|---------------------------------|--------------|
-| Ventura                    | 13.1                            | Yes          |
+| Sequoia                    | 15.0                            | Yes          |
 
 Script Operations
 ------------

diff --git a/documentation/installGPGSuite.md b/documentation/installGPGSuite.md
@@ -1,6 +1,6 @@
 Jamf Pro Scripts for macOS Management - Install GPG Suite
 ==============
-This script runs during the post-DEP DEPNotify run and installs [GPG Suite](https://gpgtools.org/) for the initially created user
+This script runs during the post-DEP Setup-Your-Mac run and installs [GPG Suite](https://gpgtools.org/) for the initially created user
 
 Requirements
 ------------
@@ -11,9 +11,9 @@ macOS Compatibility Matrix
 ------------
 This script has been tested on the following macOS versions
 
-| Tested macOS Major Version               | Expected Working Minor Versions     | DEP Required |
-|------------------------------------------|-------------------------------------|--------------|
-| Monterey                                 | 12.1                                | Yes          |
+| Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
+|----------------------------|---------------------------------|--------------|
+| Sequoia                    | 15.0                            | Yes          |
 
 Script Operations
 ------------

diff --git a/documentation/installHomebrew.md b/documentation/installHomebrew.md
@@ -1,6 +1,6 @@
 Jamf Pro Scripts for macOS Management - Install Homebrew
 ==============
-This script runs during the post-DEP DEPNotify run and installs [Homebrew](https://brew.sh) for the initially created user
+This script runs during the post-DEP Setup-Your-Mac run and installs [Homebrew](https://brew.sh) for the initially created user
 
 Requirements
 ------------
@@ -11,9 +11,9 @@ macOS Compatibility Matrix
 ------------
 This script has been tested on the following macOS versions
 
-| Tested macOS Major Version               | Expected Working Minor Versions     | DEP Required |
-|------------------------------------------|-------------------------------------|--------------|
-| Monterey                                 | 12.1                                | Yes          |
+| Tested macOS Major Version | Expected Working Minor Versions | DEP Required |
+|----------------------------|---------------------------------|--------------|
+| Sequoia                    | 15.0                            | Yes          |
 
 Script Operations
 ------------

diff --git a/scripts/Enrollment/commonHomebrewPackages.sh b/scripts/Enrollment/commonHomebrewPackages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Script Name: commonHomebrewPackages.sh
-# Function: Install some common Homebrew (brew.sh) brews and casks to the first user added to a new Mac during the post-DEP enrollment DEPNotify run
+# Function: Install some common Homebrew (brew.sh) brews and casks to the first user added to a new Mac during the post-DEP enrollment Setup-Your-Mac run
 # Requirements: DEP, Jamf, Homebrew
 #
 # Copyright 2020, Route 1337 LLC, All Rights Reserved.

diff --git a/scripts/Enrollment/configureTerminal.sh b/scripts/Enrollment/configureTerminal.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Script Name: configureTerminal.sh
-# Function: Configure Terminal for the first user added to a new Mac during the post-DEP enrollment DEPNotify run
+# Function: Configure Terminal for the first user added to a new Mac during the post-DEP enrollment Setup-Your-Mac run
 # Requirements: DEP, Jamf, Homebrew
 #
 # Copyright 2020, Route 1337 LLC, All Rights Reserved.

diff --git a/scripts/Enrollment/installBraveBrowser.sh b/scripts/Enrollment/installBraveBrowser.sh
@@ -2,7 +2,7 @@
 #
 # Script Name: installBraveBrowser.sh
 # Function: This script grabs and installs the latest Brave Browser so you don't have to maintain packages
-# Requirements: DEP, DEPNotify
+# Requirements: DEP, Setup-Your-Mac
 #
 # Copyright 2023, Route 1337, LLC, All Rights Reserved.
 #

diff --git a/scripts/Enrollment/installGPGSuite.sh b/scripts/Enrollment/installGPGSuite.sh
@@ -42,6 +42,3 @@ sudo hdiutil detach /Volumes/GPG\ Suite
 
 # Delete the locally saved DMG
 sudo rm -rf ${GPGSuite_LocalDMG}
-
-# Kill any running mail upgraders so DEPNotify can finish
-sudo killall "GPG Mail Upgrader"
diff --git a/scripts/Enrollment/installHomebrew.sh b/scripts/Enrollment/installHomebrew.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Script Name: installHomebrew.sh
-# Function: Deploy Homebrew (brew.sh) to the first user added to a new Mac during the post-DEP enrollment DEPNotify run
+# Function: Deploy Homebrew (brew.sh) to the first user added to a new Mac during the post-DEP enrollment Setup-Your-Mac run
 # Requirements: DEP, Jamf
 #
 # Copyright 2020, Route 1337 LLC, All Rights Reserved.
@@ -139,8 +139,6 @@ if test ! "$(sudo -u ${ConsoleUser} which brew)"; then
     sudo -H -iu ${ConsoleUser} ${BREW_BIN_PATH}/brew update  </dev/null
     # Disable Homebrew analytics
     sudo -H -iu ${ConsoleUser} ${BREW_BIN_PATH}/brew analytics off  </dev/null
-    # Disable Homebrew analytics
-    sudo -H -iu ${ConsoleUser} ${BREW_BIN_PATH}/brew tap homebrew/cask  </dev/null
 
 
 else