From 76399a77bc17fcb535a2a6bc1ee0ec461dc468b4 Mon Sep 17 00:00:00 2001
From: James Smith <james@smithjw.me>
Date: Wed, 24 Nov 2021 11:21:51 +1100
Subject: [PATCH] GitHub Recipe Updates - Indentation of install recipe -
 Create "payload" dir in the case of no pkg being created to stop PathDeleter
 errors - Fix spacing of sign recipe

---
 GitHub/GitHub_Desktop.install.recipe.yaml |  2 +-
 GitHub/GitHub_Desktop.pkg.recipe.yaml     | 25 ++++++++++++++---------
 GitHub/GitHub_Desktop.sign.recipe.yaml    | 17 ++++++++-------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/GitHub/GitHub_Desktop.install.recipe.yaml b/GitHub/GitHub_Desktop.install.recipe.yaml
index 79f0090..d9d5dfa 100644
--- a/GitHub/GitHub_Desktop.install.recipe.yaml
+++ b/GitHub/GitHub_Desktop.install.recipe.yaml
@@ -8,4 +8,4 @@ Input:
   SOFTWARE_TITLE: GitHub_Desktop
 
 Process:
-- Processor: Installer
+  - Processor: Installer
diff --git a/GitHub/GitHub_Desktop.pkg.recipe.yaml b/GitHub/GitHub_Desktop.pkg.recipe.yaml
index fa01ae0..403ef5c 100644
--- a/GitHub/GitHub_Desktop.pkg.recipe.yaml
+++ b/GitHub/GitHub_Desktop.pkg.recipe.yaml
@@ -6,15 +6,20 @@ MinimumVersion: '2.3'
 Input:
   NAME: GitHub Desktop
   SOFTWARE_TITLE: GitHub_Desktop
-  
+
 Process:
-- Processor: AppPkgCreator
-  Arguments:
-    app_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app'
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg'
+  - Processor: PkgRootCreator
+    Arguments:
+      pkgdirs: {}
+      pkgroot: '%RECIPE_CACHE_DIR%/payload'
+
+  - Processor: AppPkgCreator
+    Arguments:
+      app_path: '%RECIPE_CACHE_DIR%/unpack/%NAME%.app'
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg'
 
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/unpack'
-    - '%RECIPE_CACHE_DIR%/payload'
\ No newline at end of file
+  - Processor: PathDeleter
+    Arguments:
+      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
index f688c4b..2f7f673 100644
--- a/GitHub/GitHub_Desktop.sign.recipe.yaml
+++ b/GitHub/GitHub_Desktop.sign.recipe.yaml
@@ -7,13 +7,12 @@ Input:
   SIGNING_CERTIFICATE: Override_This_Value
 
 Process:
+  - Processor: com.github.rtrouton.SharedProcessors/PkgSigner
+    Arguments:
+      pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg'
+      signing_cert: '%SIGNING_CERTIFICATE%'
 
-- Processor: com.github.rtrouton.SharedProcessors/PkgSigner
-  Arguments:
-    pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg'
-    signing_cert: '%SIGNING_CERTIFICATE%'
-
-- Processor: PathDeleter
-  Arguments:
-    path_list:
-    - '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%-unsigned.pkg'
+  - Processor: PathDeleter
+    Arguments:
+      path_list:
+        - '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%-unsigned.pkg'