diff --git a/GitHub/GitHub_Desktop.download.recipe.yaml b/GitHub/GitHub_Desktop.download.recipe.yaml index 59dbc7e..d1ec2a6 100644 --- a/GitHub/GitHub_Desktop.download.recipe.yaml +++ b/GitHub/GitHub_Desktop.download.recipe.yaml @@ -18,23 +18,26 @@ Input: DOWNLOAD_URL: 'https://central.github.com/deployments/desktop/desktop/latest/darwin' Process: -- Processor: URLDownloader - Arguments: - filename: '%SOFTWARE_TITLE%-%ARCHITECTURE%.zip' - url: '%DOWNLOAD_URL%' + - Processor: URLDownloader + Arguments: + filename: '%SOFTWARE_TITLE%-%ARCHITECTURE%.zip' + url: '%DOWNLOAD_URL%' -- Processor: Unarchiver - Arguments: - destination_path: '%RECIPE_CACHE_DIR%/unpack' - purge_destination: true + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/unpack' -- Processor: CodeSignatureVerifier - Arguments: - input_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app' - requirement: '(identifier "com.github.GitHub" or identifier "com.github.GHAskPass") and anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = VEKTX9H2N7' + - Processor: Unarchiver + Arguments: + destination_path: '%RECIPE_CACHE_DIR%/unpack' -- Processor: Versioner - Arguments: - input_plist_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app/Contents/Info.plist' - plist_version_key: CFBundleShortVersionString + - Processor: CodeSignatureVerifier + Arguments: + input_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app' + requirement: '(identifier "com.github.GitHub" or identifier "com.github.GHAskPass") and anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = VEKTX9H2N7' + - Processor: Versioner + Arguments: + input_plist_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app/Contents/Info.plist' + plist_version_key: CFBundleShortVersionString diff --git a/Slack/Slack.jamf.recipe.yaml b/Slack/Slack.jamf.recipe.yaml index 701125d..59ec899 100644 --- a/Slack/Slack.jamf.recipe.yaml +++ b/Slack/Slack.jamf.recipe.yaml @@ -22,6 +22,12 @@ Input: UPDATE_PREDICATE: 'pkg_uploaded == False' Process: + - Processor: PathDeleter + # Cleanup parent pkg recipe + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%' + - Processor: com.github.grahampugh.jamf-upload.processors/JamfCategoryUploader Arguments: category_name: '%CATEGORY%' @@ -43,4 +49,4 @@ Process: Arguments: policy_template: '%POLICY_TEMPLATE%' policy_name: '%POLICY_NAME%' - icon: '%SELF_SERVICE_ICON%' \ No newline at end of file + icon: '%SELF_SERVICE_ICON%' diff --git a/Xcode/Xcode.jamf.recipe.yaml b/Xcode/Xcode.jamf.recipe.yaml index 9ae2bad..8fdd186 100644 --- a/Xcode/Xcode.jamf.recipe.yaml +++ b/Xcode/Xcode.jamf.recipe.yaml @@ -30,10 +30,6 @@ Process: Arguments: category_name: '%CATEGORY%' - - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader - Arguments: - pkg_category: '%CATEGORY%' - - Processor: com.github.grahampugh.jamf-upload.processors/JamfScriptUploader Arguments: script_category: '%SELF_SERVICE_CATEGORY%' @@ -41,6 +37,10 @@ Process: script_priority: '%SCRIPT_PRIORITY%' script_parameter4: '%SCRIPT_PARAMETER4_TITLE%' + - Processor: com.github.grahampugh.jamf-upload.processors/JamfPackageUploader + Arguments: + pkg_category: '%CATEGORY%' + - Processor: StopProcessingIf Arguments: predicate: '%UPDATE_PREDICATE%'