From b5bbda7208e8dc523b4e778197132ca94cf6eb7f Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 4 Jun 2024 11:00:07 +0200
Subject: [PATCH] fix(macos): clean keychain only after dmg [skip ci]

---
 prepare_assets.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/prepare_assets.sh b/prepare_assets.sh
index d591c6b..3ab7c1d 100755
--- a/prepare_assets.sh
+++ b/prepare_assets.sh
@@ -71,11 +71,6 @@ if [[ "${OS_NAME}" == "osx" ]]; then
     xcrun stapler staple ./*.app
     # spctl --assess -vv --type install ./*.app
 
-    echo "+ clean"
-
-    security delete-keychain "${KEYCHAIN}"
-    # shellcheck disable=SC2086
-    security list-keychains -s $KEYCHAINS
     rm "${ZIP_FILE}"
 
     cd ..
@@ -91,8 +86,8 @@ if [[ "${OS_NAME}" == "osx" ]]; then
   if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then
     echo "Building and moving DMG"
     pushd "VSCode-darwin-${VSCODE_ARCH}"
-    npx create-dmg ./*.app ..
-    mv ../*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
+    npx create-dmg ./*.app .
+    mv ./*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
     popd
   fi
 
@@ -101,6 +96,13 @@ if [[ "${OS_NAME}" == "osx" ]]; then
     git archive --format zip --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.zip" HEAD
   fi
 
+  if [[ -n "${CERTIFICATE_OSX_P12_DATA}" ]]; then
+    echo "+ clean"
+    security delete-keychain "${KEYCHAIN}"
+    # shellcheck disable=SC2086
+    security list-keychains -s $KEYCHAINS
+  fi
+
   VSCODE_PLATFORM="darwin"
 elif [[ "${OS_NAME}" == "windows" ]]; then
   cd vscode || { echo "'vscode' dir not found"; exit 1; }