Adding FriendlyPathDeleter

- Modification to PathDeleter with a flag that can be set so it doesn't fail when a given path is not found - Updating recipes that use PathDeleter, and moving them to FriendlyPathDeleter
mikeknight85 · Dec 21, 2021 · 2e4a63c · 2e4a63c
1 parent 086d511
commit 2e4a63c
Show file tree

Hide file tree

Showing 28 changed files with 355 additions and 239 deletions.
diff --git a/Cisco/Webex.pkg.recipe.yaml b/Cisco/Webex.pkg.recipe.yaml
@@ -4,20 +4,21 @@ ParentRecipe: com.github.smithjw.download.webex
 MinimumVersion: '2.3'
 
 Input:
-    NAME: Webex
+  NAME: Webex
 
 Process:
-    - Processor: PkgRootCreator
-      Arguments:
-          pkgdirs: {}
-          pkgroot: '%RECIPE_CACHE_DIR%/payload'
+  - Processor: PkgRootCreator
+    Arguments:
+      pkgdirs: {}
+      pkgroot: '%RECIPE_CACHE_DIR%/payload'
 
-    - Processor: AppPkgCreator
-      Arguments:
-          app_path: '%pathname%/Webex.app'
-          pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg'
+  - Processor: AppPkgCreator
+    Arguments:
+      app_path: '%pathname%/Webex.app'
+      pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg'
 
-    - Processor: PathDeleter
-      Arguments:
-          path_list:
-              - '%RECIPE_CACHE_DIR%/payload'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/payload'
diff --git a/Cisco/Webex.sign.recipe.yaml b/Cisco/Webex.sign.recipe.yaml
@@ -12,7 +12,8 @@ Process:
       pkg_path: '%pkg_path%'
       signing_cert: '%SIGNING_CERTIFICATE%'
 
-  - Processor: PathDeleter
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
     Arguments:
+      fail_deleter_silently: True
       path_list:
         - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg'
diff --git a/DisplayLink/DisplayLink Manager.pkg.recipe.yaml b/DisplayLink/DisplayLink Manager.pkg.recipe.yaml
@@ -8,24 +8,25 @@ Input:
   DOWNLOAD_URL: https://www.displaylink.com/downloads
 
 Process:
-- Processor: FlatPkgUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/unpack'
-    flat_pkg_path: '%pathname%'
-    skip_payload: true
+  - Processor: FlatPkgUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/unpack'
+      flat_pkg_path: '%pathname%'
+      skip_payload: true
 
-- Processor: com.facebook.autopkg.shared/PackageInfoVersioner
-  Arguments:
-    package_info_path: '%RECIPE_CACHE_DIR%/unpack/DisplayLinkManagerApp.pkg/PackageInfo'
+  - Processor: com.facebook.autopkg.shared/PackageInfoVersioner
+    Arguments:
+      package_info_path: '%RECIPE_CACHE_DIR%/unpack/DisplayLinkManagerApp.pkg/PackageInfo'
 
-- Processor: com.github.homebysix.VersionSplitter/VersionSplitter
+  - Processor: com.github.homebysix.VersionSplitter/VersionSplitter
 
-- Processor: PkgCopier
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
-    source_pkg: '%pathname%'
+  - Processor: PkgCopier
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
+      source_pkg: '%pathname%'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/unpack'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/unpack'
diff --git a/Docker/Docker.pkg.recipe.yaml b/Docker/Docker.pkg.recipe.yaml
@@ -4,20 +4,21 @@ ParentRecipe: com.github.smithjw.download.Docker
 MinimumVersion: '2.3'
 
 Input:
-    NAME: Docker
+  NAME: Docker
 
 Process:
-    - Processor: PkgRootCreator
-      Arguments:
-          pkgdirs: {}
-          pkgroot: '%RECIPE_CACHE_DIR%/payload'
+  - Processor: PkgRootCreator
+    Arguments:
+      pkgdirs: {}
+      pkgroot: '%RECIPE_CACHE_DIR%/payload'
 
-    - Processor: AppPkgCreator
-      Arguments:
-          app_path: '%pathname%/%NAME%.app'
-          pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg'
+  - Processor: AppPkgCreator
+    Arguments:
+      app_path: '%pathname%/%NAME%.app'
+      pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg'
 
-    - Processor: PathDeleter
-      Arguments:
-          path_list:
-              - '%RECIPE_CACHE_DIR%/payload'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/payload'
diff --git a/Docker/Docker.sign.recipe.yaml b/Docker/Docker.sign.recipe.yaml
@@ -4,15 +4,16 @@ ParentRecipe: com.github.smithjw.pkg.Docker
 MinimumVersion: '2.3'
 
 Input:
-    SIGNING_CERTIFICATE: Override_This_Value
+  SIGNING_CERTIFICATE: Override_This_Value
 
 Process:
-    - Processor: com.github.rtrouton.SharedProcessors/PkgSigner
-      Arguments:
-          pkg_path: '%pkg_path%'
-          signing_cert: '%SIGNING_CERTIFICATE%'
+  - Processor: com.github.rtrouton.SharedProcessors/PkgSigner
+    Arguments:
+      pkg_path: '%pkg_path%'
+      signing_cert: '%SIGNING_CERTIFICATE%'
 
-    - Processor: PathDeleter
-      Arguments:
-          path_list:
-              - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg'
diff --git a/GitHub/GitHub_Desktop.pkg.recipe.yaml b/GitHub/GitHub_Desktop.pkg.recipe.yaml
@@ -18,8 +18,9 @@ Process:
       app_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app'
       pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg'
 
-  - Processor: PathDeleter
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
     Arguments:
+      fail_deleter_silently: True
       path_list:
         - '%RECIPE_CACHE_DIR%/unpack'
         - '%RECIPE_CACHE_DIR%/payload'
diff --git a/GitHub/GitHub_Desktop.sign.recipe.yaml b/GitHub/GitHub_Desktop.sign.recipe.yaml
@@ -12,7 +12,8 @@ Process:
       pkg_path: '%pkg_path%'
       signing_cert: '%SIGNING_CERTIFICATE%'
 
-  - Processor: PathDeleter
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
     Arguments:
+      fail_deleter_silently: True
       path_list:
         - '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%-unsigned.pkg'
diff --git a/Google/Google_Chrome.pkg.recipe.yaml b/Google/Google_Chrome.pkg.recipe.yaml
@@ -7,26 +7,27 @@ Input:
   NAME: Google Chrome
 
 Process:
-- Processor: FlatPkgUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/unpack'
-    flat_pkg_path: '%pathname%'
+  - Processor: FlatPkgUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/unpack'
+      flat_pkg_path: '%pathname%'
 
-- Processor: PkgPayloadUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/unpack'
-    pkg_payload_path: '%RECIPE_CACHE_DIR%/unpack/%PKGPAYLOADNAME%.pkg/Payload'
+  - Processor: PkgPayloadUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/unpack'
+      pkg_payload_path: '%RECIPE_CACHE_DIR%/unpack/%PKGPAYLOADNAME%.pkg/Payload'
 
-- Processor: PlistReader
-  Arguments:
-    info_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app'
+  - Processor: PlistReader
+    Arguments:
+      info_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app'
 
-- Processor: PkgCopier
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARETITLE%-%version%.pkg'
-    source_pkg: '%pathname%'
+  - Processor: PkgCopier
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARETITLE%-%version%.pkg'
+      source_pkg: '%pathname%'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/unpack'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/unpack'
diff --git a/Handbrake/Handbrake.sign.recipe.yaml b/Handbrake/Handbrake.sign.recipe.yaml
@@ -12,7 +12,8 @@ Process:
       pkg_path: '%pkg_path%'
       signing_cert: '%SIGNING_CERTIFICATE%'
 
-  - Processor: PathDeleter
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
     Arguments:
+      fail_deleter_silently: True
       path_list:
         - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg'
diff --git a/Logitech/Logi_Options.pkg.recipe.yaml b/Logitech/Logi_Options.pkg.recipe.yaml
@@ -8,21 +8,22 @@ Input:
   SOFTWARE_TITLE: Logi_Options
 
 Process:
-- Processor: FileFinder
-  Arguments:
-    pattern: '%RECIPE_CACHE_DIR%/unpack/LogiMgr Installer*.app/Contents/Info.plist'
+  - Processor: FileFinder
+    Arguments:
+      pattern: '%RECIPE_CACHE_DIR%/unpack/LogiMgr Installer*.app/Contents/Info.plist'
 
-- Processor: Versioner
-  Arguments:
-    input_plist_path: '%found_filename%'
-    plist_version_key: CFBundleShortVersionString
+  - Processor: Versioner
+    Arguments:
+      input_plist_path: '%found_filename%'
+      plist_version_key: CFBundleShortVersionString
 
-- Processor: PkgCopier
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
-    source_pkg: '%INSTALLER_PKG%'
+  - Processor: PkgCopier
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
+      source_pkg: '%INSTALLER_PKG%'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/unpack'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/unpack'
diff --git a/Microsoft/Microsoft_Company_Portal.pkg.recipe.yaml b/Microsoft/Microsoft_Company_Portal.pkg.recipe.yaml
@@ -8,32 +8,33 @@ Input:
   SOFTWARE_TITLE: Microsoft_Company_Portal
 
 Process:
-- Processor: FlatPkgUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/downloads/unpack'
-    flat_pkg_path: '%pathname%'
+  - Processor: FlatPkgUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/downloads/unpack'
+      flat_pkg_path: '%pathname%'
 
-- Processor: FileFinder
-  Arguments:
-    pattern: '%RECIPE_CACHE_DIR%/downloads/unpack/*CompanyPortal*.pkg'
+  - Processor: FileFinder
+    Arguments:
+      pattern: '%RECIPE_CACHE_DIR%/downloads/unpack/*CompanyPortal*.pkg'
 
-- Processor: PkgPayloadUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/downloads/payload'
-    pkg_payload_path: '%found_filename%/Payload'
+  - Processor: PkgPayloadUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/downloads/payload'
+      pkg_payload_path: '%found_filename%/Payload'
 
-- Processor: Versioner
-  Arguments:
-    input_plist_path: '%RECIPE_CACHE_DIR%/downloads/payload/Applications/Company Portal.app/Contents/Info.plist'
-    plist_version_key: CFBundleShortVersionString
+  - Processor: Versioner
+    Arguments:
+      input_plist_path: '%RECIPE_CACHE_DIR%/downloads/payload/Applications/Company Portal.app/Contents/Info.plist'
+      plist_version_key: CFBundleShortVersionString
 
-- Processor: PkgCopier
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
-    source_pkg: '%pathname%'
+  - Processor: PkgCopier
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
+      source_pkg: '%pathname%'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/downloads/unpack'
-    - '%RECIPE_CACHE_DIR%/downloads/payload'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/downloads/unpack'
+        - '%RECIPE_CACHE_DIR%/downloads/payload'
diff --git a/Microsoft/Microsoft_Defender.pkg.recipe.yaml b/Microsoft/Microsoft_Defender.pkg.recipe.yaml
@@ -8,32 +8,33 @@ Input:
   SOFTWARE_TITLE: Microsoft_Defender
 
 Process:
-- Processor: FlatPkgUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/unpack'
-    flat_pkg_path: '%pathname%'
+  - Processor: FlatPkgUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/unpack'
+      flat_pkg_path: '%pathname%'
 
-- Processor: FileFinder
-  Arguments:
-    pattern: '%RECIPE_CACHE_DIR%/unpack/*wdav*.pkg'
+  - Processor: FileFinder
+    Arguments:
+      pattern: '%RECIPE_CACHE_DIR%/unpack/*wdav*.pkg'
 
-- Processor: PkgPayloadUnpacker
-  Arguments:
-    destination_path: '%RECIPE_CACHE_DIR%/payload'
-    pkg_payload_path: '%found_filename%/Payload'
+  - Processor: PkgPayloadUnpacker
+    Arguments:
+      destination_path: '%RECIPE_CACHE_DIR%/payload'
+      pkg_payload_path: '%found_filename%/Payload'
 
-- Processor: Versioner
-  Arguments:
-    input_plist_path: '%RECIPE_CACHE_DIR%/payload/Microsoft Defender ATP.app/Contents/Info.plist'
-    plist_version_key: 'CFBundleShortVersionString'
+  - Processor: Versioner
+    Arguments:
+      input_plist_path: '%RECIPE_CACHE_DIR%/payload/Microsoft Defender ATP.app/Contents/Info.plist'
+      plist_version_key: 'CFBundleShortVersionString'
 
-- Processor: PkgCopier
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
-    source_pkg: '%pathname%'
+  - Processor: PkgCopier
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
+      source_pkg: '%pathname%'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/unpack'
-    - '%RECIPE_CACHE_DIR%/payload'
+  - Processor: com.github.smithjw.processors/FriendlyPathDeleter
+    Arguments:
+      fail_deleter_silently: True
+      path_list:
+        - '%RECIPE_CACHE_DIR%/unpack'
+        - '%RECIPE_CACHE_DIR%/payload'