Reduce redundant Cache files

autopkg · Nov 17, 2024 · 761351c · 761351c
1 parent 522a099
commit 761351c
Show file tree

Hide file tree

Showing 22 changed files with 207 additions and 64 deletions.
diff --git a/AdobeAdminConsole/AdobeAdminConsole.jamf-upload.recipe.yaml b/AdobeAdminConsole/AdobeAdminConsole.jamf-upload.recipe.yaml
@@ -2,8 +2,7 @@ Description: |
   For use with DataJAR's AdobeAdminConsolePackagesImporter.py.
 
   Using the information gathered by AdobeAdminConsolePackagesImporter.py,
-  copies the identified pkg to the recipe cache dir, then uploads the
-  package to Jamf Pro.
+  uploads the identified pkg to Jamf Pro.
 
   Intended use is to generate an override from this recipe, then
   give the override an unique Identifier and populate all the
@@ -22,7 +21,6 @@ Description: |
 
 Identifier: com.github.davidbpirie.jamf-upload.AdobeAdminConsole
 MinimumVersion: 2.3.0
-ParentRecipe: com.github.davidbpirie.pkg.AdobeAdminConsole
 
 Input:
   NAME: AdobeAdminConsole
@@ -36,15 +34,18 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
   aacp_application_architecture_type: Populate with AdobeAdminConsolePackagesImporter.py
   aacp_application_description: Populate with AdobeAdminConsolePackagesImporter.py
   aacp_application_install_lang: Populate with AdobeAdminConsolePackagesImporter.py
   aacp_application_version: Populate with AdobeAdminConsolePackagesImporter.py
+  aacp_package_path: Populate with AdobeAdminConsolePackagesImporter.py
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
-      pkg_name: '%JAMF_PKG_NAME%_%aacp_application_install_lang%_%aacp_application_architecture_type%-%aacp_application_version%.pkg'
+      pkg_name: '%JAMF_PKG_NAME%_%aacp_application_install_lang%_%aacp_application_architecture_type%-%aacp_application_version%.%JAMF_PKG_SUFFIX%'
+      pkg_path: '%aacp_package_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%aacp_application_description%'
       pkg_notes: '%JAMF_PKG_NOTES%'

diff --git a/AdobeReader/AdobeReader.jamf-upload.recipe.yaml b/AdobeReader/AdobeReader.jamf-upload.recipe.yaml
@@ -1,7 +1,8 @@
 Description: |
   Downloads the current Adobe Acrobat Reader pkg and repackages,
   replacing a problematic preinstall script, and enabling installation
-  on non-boot volumes, then uploads the package to Jamf Pro.
+  on non-boot volumes, then uploads the package to Jamf Pro and
+  deletes the package.
 
   JSS_URL, API_USERNAME, and API_PASSWORD, and for non-cloud instances
   SMB_URL, SMB_USERNAME and SMB_PASSWORD, are expected to be populated
@@ -25,11 +26,13 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
       pkg_name: '%JAMF_PKG_NAME%-%version%.pkg'
+      pkg_path: '%pkg_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%JAMF_PKG_INFO%'
       pkg_notes: '%JAMF_PKG_NOTES%'
@@ -40,3 +43,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Avid/AvidProTools.jamf-upload.recipe.yaml b/Avid/AvidProTools.jamf-upload.recipe.yaml
@@ -46,3 +46,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Avid/AvidProToolsPlugin.jamf-upload.recipe.yaml b/Avid/AvidProToolsPlugin.jamf-upload.recipe.yaml
@@ -1,6 +1,7 @@
 Description: |
   Copies the plug-in installer pkg from the source DMG, verifying
-  the signature and extracting the version, then uploads the package to Jamf Pro.
+  the signature and extracting the version, then uploads the package to Jamf Pro
+  and deletes the package.
 
   All Pro Tools plug-ins include a <plugin> AppMan.pkg component,
   so version information is read from there.
@@ -49,3 +50,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Avid/AvidSibelius.jamf-upload.recipe.yaml b/Avid/AvidSibelius.jamf-upload.recipe.yaml
@@ -2,7 +2,7 @@ Description: |
   Copies the Sibelius pkg from the source DMG, verifying the signature and
   extracting the version, then creates a package that installs the Sibelius
   pkg via a postinstall script, applying a custom set of choices, then
-  uploads the package to Jamf Pro.
+  uploads the package to Jamf Pro and deletes the package.
 
   Package source DMG must be manually downloaded from Avid, then provided
   either as Input Variable PKG or via the -p parameter eg:
@@ -54,3 +54,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blackmagic/BlackmagicATEMSwitchers.jamf-upload.recipe.yaml b/Blackmagic/BlackmagicATEMSwitchers.jamf-upload.recipe.yaml
@@ -1,6 +1,7 @@
 Description: |
   Downloads latest version of ATEM Switcher disk image, copies
-  the package from the DMG, then uploads the package to Jamf Pro.
+  the package from the DMG, then uploads the package to Jamf Pro
+  and deletes the package.
 
   This product requires registration in order to download, so
   you _must_ override all input variables beginning with 'REG_'
@@ -48,3 +49,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blackmagic/BlackmagicConverters.jamf-upload.recipe.yaml b/Blackmagic/BlackmagicConverters.jamf-upload.recipe.yaml
@@ -1,6 +1,7 @@
 Description: |
   Downloads latest version of Blackmagic Converters disk image, copies
-  the package from the DMG, then uploads the package to Jamf Pro.
+  the package from the DMG, then uploads the package to Jamf Pro and
+  deletes the package.
 
   This product requires registration in order to download, so
   you _must_ override all input variables beginning with 'REG_'
@@ -48,3 +49,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blackmagic/BlackmagicDaVinciResolve.jamf-upload.recipe.yaml b/Blackmagic/BlackmagicDaVinciResolve.jamf-upload.recipe.yaml
@@ -1,7 +1,7 @@
 Description: |
   Downloads latest version of DaVinci Resolve disk image, then
   copies the package from the DMG, extracting the version, then
-  uploads the package to Jamf Pro.
+  uploads the package to Jamf Pro and deletes the package.
 
   This product requires registration in order to download, so
   you _must_ override all input variables beginning with 'REG_'
@@ -54,3 +54,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blackmagic/BlackmagicDesktopVideo.jamf-upload.recipe.yaml b/Blackmagic/BlackmagicDesktopVideo.jamf-upload.recipe.yaml
@@ -1,7 +1,7 @@
 Description: |
   Downloads latest version of Desktop Video disk image, then
   copies the package from the DMG, extracting the version, then
-  uploads the package to Jamf Pro.
+  uploads the package to Jamf Pro and deletes the package.
 
   This product requires registration in order to download, so
   you _must_ override all input variables beginning with 'REG_'
@@ -52,3 +52,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blackmagic/BlackmagicWebPresenter.jamf-upload.recipe.yaml b/Blackmagic/BlackmagicWebPresenter.jamf-upload.recipe.yaml
@@ -1,7 +1,7 @@
 Description: |
   Downloads latest version of Web Presenter disk image, then
   copies the package from the DMG, extracting the version, then
-  uploads the package to Jamf Pro.
+  uploads the package to Jamf Pro and deletes the package.
 
   This product requires registration in order to download, so
   you _must_ override all input variables beginning with 'REG_'
@@ -49,3 +49,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/Blender/Blender.jamf-upload.recipe.yaml b/Blender/Blender.jamf-upload.recipe.yaml
@@ -26,11 +26,13 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
-      pkg_name: '%JAMF_PKG_NAME%_%ARCHITECTURE%-%version%.pkg'
+      pkg_name: '%JAMF_PKG_NAME%_%ARCHITECTURE%-%version%.%JAMF_PKG_SUFFIX%'
+      pkg_path: '%pkg_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%JAMF_PKG_INFO%'
       pkg_notes: '%JAMF_PKG_NOTES%'
@@ -41,3 +43,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/EIZO/ColorNavigator7.jamf-upload.recipe.yaml b/EIZO/ColorNavigator7.jamf-upload.recipe.yaml
@@ -47,3 +47,10 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%RECIPE_CACHE_DIR%/unpack'
+      - '%RECIPE_CACHE_DIR%/payload'
+      - '%RECIPE_CACHE_DIR%/repack'
diff --git a/GoogleChrome/GoogleChrome.jamf-upload.recipe.yaml b/GoogleChrome/GoogleChrome.jamf-upload.recipe.yaml
@@ -1,6 +1,6 @@
 Description: |
   Downloads latest Google Chrome disk image and builds a package, then
-  uploads the package to Jamf Pro.
+  uploads the package to Jamf Pro and deletes the package.
 
   JSS_URL, API_USERNAME, and API_PASSWORD, and for non-cloud instances
   SMB_URL, SMB_USERNAME and SMB_PASSWORD, are expected to be populated
@@ -23,11 +23,13 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
-      pkg_name: '%JAMF_PKG_NAME%-%version%.pkg'
+      pkg_name: '%JAMF_PKG_NAME%-%version%.%JAMF_PKG_SUFFIX%'
+      pkg_path: '%pkg_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%JAMF_PKG_INFO%'
       pkg_notes: '%JAMF_PKG_NOTES%'
@@ -38,3 +40,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/MicrosoftDefender/MicrosoftDefender.jamf-upload.recipe.yaml b/MicrosoftDefender/MicrosoftDefender.jamf-upload.recipe.yaml
@@ -1,6 +1,6 @@
 Description: |
-  Downloads the latest Microsoft Defender pkg,
-  then uploads the package to Jamf Pro.
+  Downloads the latest Microsoft Defender pkg, then uploads the package
+  to Jamf Pro and deletes the package.
 
   JSS_URL, API_USERNAME, and API_PASSWORD, and for non-cloud instances
   SMB_URL, SMB_USERNAME and SMB_PASSWORD, are expected to be populated
@@ -23,11 +23,13 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
-      pkg_name: '%JAMF_PKG_NAME%-%version%.pkg'
+      pkg_name: '%JAMF_PKG_NAME%-%version%.%JAMF_PKG_SUFFIX%'
+      pkg_path: '%pkg_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%JAMF_PKG_INFO%'
       pkg_notes: '%JAMF_PKG_NOTES%'
@@ -38,3 +40,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'
diff --git a/MicrosoftEdge/MicrosoftEdge.jamf-upload.recipe.yaml b/MicrosoftEdge/MicrosoftEdge.jamf-upload.recipe.yaml
@@ -1,6 +1,7 @@
 Description: |
   Downloads the latest Microsoft Edge pkg, and appends the version
-  to the end of the filename, then uploads the package to Jamf Pro.
+  to the end of the filename, then uploads the package to Jamf Pro
+  and deletes the package.
 
   JSS_URL, API_USERNAME, and API_PASSWORD, and for non-cloud instances
   SMB_URL, SMB_USERNAME and SMB_PASSWORD, are expected to be populated
@@ -23,11 +24,13 @@ Input:
   JAMF_PKG_SEND_NOTIFICATION: 'False'
   JAMF_PKG_REPLACE: 'False'
   JAMF_PKG_REPLACE_METADATA: 'False'
+  JAMF_PKG_SUFFIX: 'pkg'
 
 Process:
   - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader
     Arguments:
-      pkg_name: '%JAMF_PKG_NAME%-%version%.pkg'
+      pkg_name: '%JAMF_PKG_NAME%-%version%.%JAMF_PKG_SUFFIX%'
+      pkg_path: '%pkg_path%'
       pkg_category: '%JAMF_CATEGORY%'
       pkg_info: '%JAMF_PKG_INFO%'
       pkg_notes: '%JAMF_PKG_NOTES%'
@@ -38,3 +41,8 @@ Process:
       send_notification: '%JAMF_PKG_SEND_NOTIFICATION%'
       replace_pkg: '%JAMF_PKG_REPLACE%'
       replace_pkg_metadata: '%JAMF_PKG_REPLACE_METADATA%'
+
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+      - '%pkg_path%'