From 372f29fc4c81f0446223932b30698621e427ac85 Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Tue, 11 Jun 2024 23:34:47 +1000 Subject: [PATCH] Remove additional package steps (#129) --- .github/workflows/draft_new_release.yml | 8 ----- Mist.pkg.recipe.yaml | 41 ------------------------- Scripts/postinstall | 11 ------- Scripts/preinstall | 11 ------- 4 files changed, 71 deletions(-) delete mode 100755 Scripts/postinstall delete mode 100755 Scripts/preinstall diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml index 366f1c8..5475024 100644 --- a/.github/workflows/draft_new_release.yml +++ b/.github/workflows/draft_new_release.yml @@ -68,19 +68,11 @@ jobs: PACKAGE_FILENAME="Mist.${{ env.APP_VERSION }}.pkg" echo "PACKAGE_FILENAME=$PACKAGE_FILENAME" >> "$GITHUB_ENV" mkdir -p "$PACKAGE_TEMP/Applications" - mkdir -p "$PACKAGE_TEMP/Library/LaunchDaemons" - mkdir -p "$PACKAGE_TEMP/Library/PrivilegedHelperTools" ditto "Export/Mist.app" "$PACKAGE_TEMP/Applications/Mist.app" - cp "com.ninxsoft.mist.helper.plist" "$PACKAGE_TEMP/Library/LaunchDaemons/com.ninxsoft.mist.helper.plist" - cp "Export/Mist.app/Contents/Library/LaunchServices/com.ninxsoft.mist.helper" "$PACKAGE_TEMP/Library/PrivilegedHelperTools/com.ninxsoft.mist.helper" - chmod 644 "$PACKAGE_TEMP/Library/LaunchDaemons/com.ninxsoft.mist.helper.plist" - chmod 544 "$PACKAGE_TEMP/Library/PrivilegedHelperTools/com.ninxsoft.mist.helper" - rm "Scripts/uninstall.sh" pkgbuild --root "$PACKAGE_TEMP" \ --identifier "$PACKAGE_IDENTIFIER" \ --version "${{ env.APP_VERSION }}" \ --min-os-version "12.0" \ - --scripts "Scripts" \ --sign "$APPLE_DEVELOPER_ID_INSTALLER_SIGNING_IDENTITY" \ "$PACKAGE_FILENAME" - name: Notarize Package diff --git a/Mist.pkg.recipe.yaml b/Mist.pkg.recipe.yaml index 695e966..1c5896e 100644 --- a/Mist.pkg.recipe.yaml +++ b/Mist.pkg.recipe.yaml @@ -21,29 +21,10 @@ Process: pkgroot: "%RECIPE_CACHE_DIR%/payload" pkgdirs: "Applications": "0755" - "Library": "0755" - "Library/LaunchDaemons": "0755" - "Library/PrivilegedHelperTools": "0755" - Processor: Copier Arguments: source_path: "/Applications/Mist.app" destination_path: "%RECIPE_CACHE_DIR%/payload/Applications/Mist.app" - - Processor: Copier - Arguments: - source_path: "/Library/LaunchDaemons/com.ninxsoft.mist.helper.plist" - destination_path: "%RECIPE_CACHE_DIR%/payload/Library/LaunchDaemons/com.ninxsoft.mist.helper.plist" - - Processor: Copier - Arguments: - source_path: "/Applications/Mist.app/Contents/Library/LaunchServices/com.ninxsoft.mist.helper" - destination_path: "%RECIPE_CACHE_DIR%/payload/Library/PrivilegedHelperTools/com.ninxsoft.mist.helper" - - Processor: Copier - Arguments: - source_path: "%MIST_RECIPE_DIR%/Scripts" - destination_path: "%RECIPE_CACHE_DIR%/scripts" - - Processor: PathDeleter - Arguments: - path_list: - - "%RECIPE_CACHE_DIR%/scripts/uninstall.sh" - Processor: PkgCreator Arguments: pkg_request: @@ -62,27 +43,6 @@ Process: user: root group: wheel mode: "0755" - - path: /Library - user: root - group: wheel - mode: "0755" - - path: /Library/LaunchDaemons - user: root - group: wheel - mode: "0755" - - path: /Library/LaunchDaemons/com.ninxsoft.mist.helper.plist - user: root - group: wheel - mode: "0644" - - path: /Library/PrivilegedHelperTools - user: root - group: wheel - mode: "0755" - - path: /Library/PrivilegedHelperTools/com.ninxsoft.mist.helper - user: root - group: wheel - mode: "0544" - scripts: "%RECIPE_CACHE_DIR%/scripts" - Processor: com.github.rtrouton.SharedProcessors/PkgSigner Arguments: pkg_path: "%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg" @@ -94,5 +54,4 @@ Process: - Processor: PathDeleter Arguments: path_list: - - "%RECIPE_CACHE_DIR%/scripts" - "%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg" diff --git a/Scripts/postinstall b/Scripts/postinstall deleted file mode 100755 index 8ef5fba..0000000 --- a/Scripts/postinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -identifier="com.ninxsoft.mist.helper" - -if ! launchctl print "system/$identifier" &> /dev/null ; then - launchctl bootstrap system "/Library/LaunchDaemons/$identifier.plist" -fi - -exit 0 diff --git a/Scripts/preinstall b/Scripts/preinstall deleted file mode 100755 index 9e23b68..0000000 --- a/Scripts/preinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -identifier="com.ninxsoft.mist.helper" - -if launchctl print "system/$identifier" &> /dev/null ; then - launchctl bootout "system/$identifier" -fi - -exit 0