From fbf31f1f1dd64eff8786fa0755d3e8171429bc52 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Sat, 24 Jun 2023 02:59:50 +0800
Subject: [PATCH] chore

---
 .github/workflows/flutter-build.yml | 24 ++++++++++++------------
 build.py                            |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index 7de5af879..3ff337a93 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Install vcpkg dependencies
         run: |
           cd C:\
-          git clone https://github.com/Kingtous/rustdesk_thirdpary_lib --depth=1 
+          git clone https://github.com/rustdesk-org/rustdesk_thirdpary_lib --depth=1 
           
       - name: Build rustdesk
         env:
@@ -153,7 +153,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install LLVM and Clang
-        uses: Kingtous/install-llvm-action-32bit@master
+        uses: rustdesk-org/install-llvm-action-32bit@master
         with:
           version: ${{ env.LLVM_VERSION }}
 
@@ -178,7 +178,7 @@ jobs:
       - name: Install vcpkg dependencies
         run: |
           cd C:\
-          git clone https://github.com/Kingtous/rustdesk_thirdpary_lib --depth=1 
+          git clone https://github.com/rustdesk-org/rustdesk_thirdpary_lib --depth=1 
 
       - name: Build rustdesk
         id: build
@@ -405,7 +405,7 @@ jobs:
         shell: bash
         run: |
           pushd /opt
-          sudo git clone https://github.com/Kingtous/rustdesk_thirdparty_lib.git --depth=1
+          sudo git clone https://github.com/rustdesk-org/rustdesk_thirdparty_lib.git --depth=1
 
       - name: Restore bridge files
         uses: actions/download-artifact@master
@@ -505,7 +505,7 @@ jobs:
         shell: bash
         run: |
           pushd /opt
-          git clone https://github.com/Kingtous/rustdesk_thirdparty_lib.git --depth=1
+          git clone https://github.com//rustdesk-orgrustdesk_thirdparty_lib.git --depth=1
 
       - name: Restore bridge files
         uses: actions/download-artifact@master
@@ -722,7 +722,7 @@ jobs:
           name: vcpkg-artifact-${{ matrix.job.arch }}
           path: /opt/artifacts/vcpkg/installed
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk library for ${{ matrix.job.arch }}
         id: vcpkg
         with:
@@ -893,7 +893,7 @@ jobs:
           name: vcpkg-artifact-${{ matrix.job.arch }}
           path: /opt/artifacts/vcpkg/installed
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk library for ${{ matrix.job.arch }}
         id: vcpkg
         with:
@@ -1030,7 +1030,7 @@ jobs:
           name: vcpkg-artifact-${{ matrix.job.arch }}
           path: /opt/artifacts/vcpkg/installed
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk sciter binary for ${{ matrix.job.arch }}
         id: vcpkg
         with:
@@ -1178,7 +1178,7 @@ jobs:
             git reset --hard ${{ env.FLUTTER_ELINUX_COMMIT_ID }} 
           popd
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk binary for ${{ matrix.job.arch }}
         id: vcpkg
         with:
@@ -1424,7 +1424,7 @@ jobs:
           name: librustdesk-${{ matrix.job.arch }}-${{ matrix.job.extra-build-features }}.so
           path: ./target/release/
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk binary for ${{ matrix.job.arch }}
         id: vcpkg
         with:
@@ -1613,7 +1613,7 @@ jobs:
   #       run: |
   #         mv rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb rustdesk-${{ env.VERSION }}.deb
 
-  #     - uses: Kingtous/run-on-arch-action@amd64-support
+  #     - uses: rustdesk-org/run-on-arch-action@amd64-support
   #       name: Build rustdesk flatpak package for ${{ matrix.job.arch }}
   #       id: rpm
   #       with:
@@ -1674,7 +1674,7 @@ jobs:
         run: |
           mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb rustdesk-${{ env.VERSION }}.deb
 
-      - uses: Kingtous/run-on-arch-action@amd64-support
+      - uses: rustdesk-org/run-on-arch-action@amd64-support
         name: Build rustdesk flatpak package for ${{ matrix.job.arch }}
         id: rpm
         with:
diff --git a/build.py b/build.py
index 07caefc5c..9e19e10e7 100755
--- a/build.py
+++ b/build.py
@@ -568,11 +568,11 @@ def main():
     #rcodesign sign --p12-file ~/.p12/rustdesk-developer-id.p12 --p12-password-file ~/.p12/.cert-pass --code-signature-flags runtime ./rustdesk-{1}.dmg
     codesign -s "Developer ID Application: {0}" --force --options runtime ./rustdesk-{1}.dmg
     # https://appstoreconnect.apple.com/access/api
-    # https://gregoryszorc.com/docs/apple-codesign/0.16.0/apple_codesign_rcodesign.html#notarizing-and-stapling
-    # p8 file is generated when you generate api key, download and put it under ~/.private_keys/
-    rcodesign notarize --api-issuer {2} --api-key {3} --staple ./rustdesk-{1}.dmg
+    # https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_getting_started.html#apple-codesign-app-store-connect-api-key
+    # p8 file is generated when you generate api key (can download only once)
+    rcodesign notary-submit --api-key-path ../.p12/api-key.json  --staple rustdesk-{1}.dmg
     # verify:  spctl -a -t exec -v /Applications/RustDesk.app
-    '''.format(pa, version, os.environ.get('api-issuer'), os.environ.get('api-key')))
+    '''.format(pa, version))
                 else:
                     print('Not signed')
             else: