From 747837ea9dfcae2a66f147663d0a24e24e494ea5 Mon Sep 17 00:00:00 2001 From: Tien Do Nam Date: Mon, 13 Jul 2026 23:48:32 +0200 Subject: [PATCH] refactor: move scripts/ to support/scripts/ --- .github/workflows/ci.yml | 2 +- .github/workflows/compile_apk.yml | 2 +- .github/workflows/compile_arm64_appimage.yml | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/test_zip.yml | 6 +++--- .../build}/appimage/AppImageBuilder_arm_64.yml | 0 .../build}/appimage/AppImageBuilder_x86_64.yml | 0 {scripts => support/build}/dmg/background.png | Bin .../build/windows/inno}/ChineseSimplified.isl | 0 {scripts => support/build}/windows/x64/msvcp140.dll | Bin .../build}/windows/x64/vcruntime140.dll | Bin .../build}/windows/x64/vcruntime140_1.dll | Bin {scripts => support/scripts}/compile_android_apk.sh | 0 .../scripts}/compile_android_appbundle.ps1 | 0 {scripts => support/scripts}/compile_ios.sh | 0 .../scripts}/compile_linux_appimage.sh | 0 .../scripts}/compile_mac_appstore.sh | 0 {scripts => support/scripts}/compile_mac_dmg.sh | 2 +- .../scripts}/compile_windows_exe-inno.iss | 2 +- .../scripts}/compile_windows_exe.ps1 | 4 ++-- .../scripts}/compile_windows_msix_helper.ps1 | 0 .../scripts}/compile_windows_msix_signed.ps1 | 0 .../scripts}/compile_windows_msix_store.ps1 | 0 .../scripts}/compile_windows_zip.ps1 | 0 .../scripts}/contributions_digester.dart | 0 .../scripts}/download_windows_msix.ps1 | 2 +- .../scripts}/msix/msix_downloader.ps1 | 0 .../scripts}/remove_proprietary_dependencies.sh | 0 .../scripts}/verify_exe_signature.ps1 | 0 29 files changed, 16 insertions(+), 16 deletions(-) rename {scripts => support/build}/appimage/AppImageBuilder_arm_64.yml (100%) rename {scripts => support/build}/appimage/AppImageBuilder_x86_64.yml (100%) rename {scripts => support/build}/dmg/background.png (100%) rename {scripts/Languages => support/build/windows/inno}/ChineseSimplified.isl (100%) rename {scripts => support/build}/windows/x64/msvcp140.dll (100%) rename {scripts => support/build}/windows/x64/vcruntime140.dll (100%) rename {scripts => support/build}/windows/x64/vcruntime140_1.dll (100%) rename {scripts => support/scripts}/compile_android_apk.sh (100%) rename {scripts => support/scripts}/compile_android_appbundle.ps1 (100%) rename {scripts => support/scripts}/compile_ios.sh (100%) rename {scripts => support/scripts}/compile_linux_appimage.sh (100%) rename {scripts => support/scripts}/compile_mac_appstore.sh (100%) rename {scripts => support/scripts}/compile_mac_dmg.sh (95%) rename {scripts => support/scripts}/compile_windows_exe-inno.iss (98%) rename {scripts => support/scripts}/compile_windows_exe.ps1 (84%) rename {scripts => support/scripts}/compile_windows_msix_helper.ps1 (100%) rename {scripts => support/scripts}/compile_windows_msix_signed.ps1 (100%) rename {scripts => support/scripts}/compile_windows_msix_store.ps1 (100%) rename {scripts => support/scripts}/compile_windows_zip.ps1 (100%) rename {scripts => support/scripts}/contributions_digester.dart (100%) rename {scripts => support/scripts}/download_windows_msix.ps1 (66%) rename {scripts => support/scripts}/msix/msix_downloader.ps1 (100%) rename {scripts => support/scripts}/remove_proprietary_dependencies.sh (100%) rename {scripts => support/scripts}/verify_exe_signature.ps1 (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8c64012..7e610c0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - name: Extract version from Inno Setup configuration id: inno_version run: | - VERSION=$(grep '#define MyAppVersion ' scripts/compile_windows_exe-inno.iss | sed 's/#define MyAppVersion "//' | sed 's/"//') + VERSION=$(grep '#define MyAppVersion ' support/scripts/compile_windows_exe-inno.iss | sed 's/#define MyAppVersion "//' | sed 's/"//') echo "Inno Setup version is $VERSION" echo "inno_version=$VERSION" >> $GITHUB_ENV diff --git a/.github/workflows/compile_apk.yml b/.github/workflows/compile_apk.yml index ce1f213b..61ae0eb1 100644 --- a/.github/workflows/compile_apk.yml +++ b/.github/workflows/compile_apk.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v6 - name: Remove proprietary dependencies - run: sh scripts/remove_proprietary_dependencies.sh + run: sh support/scripts/remove_proprietary_dependencies.sh - name: Copy files to env.APK_BUILD_DIR run: | diff --git a/.github/workflows/compile_arm64_appimage.yml b/.github/workflows/compile_arm64_appimage.yml index 2a5b3b92..13fc7e42 100644 --- a/.github/workflows/compile_arm64_appimage.yml +++ b/.github/workflows/compile_arm64_appimage.yml @@ -58,7 +58,7 @@ jobs: cp app/assets/img/logo-256.png AppDir/usr/share/icons/hicolor/256x256/apps/localsend.png - name: Copy Recipe to correct location - run: cp scripts/appimage/AppImageBuilder_arm_64.yml AppImageBuilder.yml + run: cp support/build/appimage/AppImageBuilder_arm_64.yml AppImageBuilder.yml - name: Build AppImage uses: AppImageCrafters/build-appimage@57c3bc6963f870ce3be103117de5b5e33ffbaeb6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f973d4d..8c5014cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v6 - name: Remove proprietary dependencies - run: sh scripts/remove_proprietary_dependencies.sh + run: sh support/scripts/remove_proprietary_dependencies.sh - name: Copy files to env.APK_BUILD_DIR run: | @@ -318,7 +318,7 @@ jobs: cp app/assets/img/logo-256.png AppDir/usr/share/icons/hicolor/256x256/apps/localsend.png - name: Copy Recipe to correct location - run: cp scripts/appimage/AppImageBuilder_x86_64.yml AppImageBuilder.yml + run: cp support/build/appimage/AppImageBuilder_x86_64.yml AppImageBuilder.yml - name: Build AppImage uses: AppImageCrafters/build-appimage@57c3bc6963f870ce3be103117de5b5e33ffbaeb6 @@ -362,9 +362,9 @@ jobs: - name: Add DLL files working-directory: app run: | - Copy-Item ../scripts/windows/x64/msvcp140.dll build/windows/x64/runner/Release/ - Copy-Item ../scripts/windows/x64/vcruntime140.dll build/windows/x64/runner/Release/ - Copy-Item ../scripts/windows/x64/vcruntime140_1.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/msvcp140.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/vcruntime140.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/vcruntime140_1.dll build/windows/x64/runner/Release/ - name: Zip compiled files working-directory: app diff --git a/.github/workflows/test_zip.yml b/.github/workflows/test_zip.yml index 0a38fc38..3a8bb771 100644 --- a/.github/workflows/test_zip.yml +++ b/.github/workflows/test_zip.yml @@ -52,9 +52,9 @@ jobs: - name: Add DLL files working-directory: app run: | - Copy-Item ../scripts/windows/x64/msvcp140.dll build/windows/x64/runner/Release/ - Copy-Item ../scripts/windows/x64/vcruntime140.dll build/windows/x64/runner/Release/ - Copy-Item ../scripts/windows/x64/vcruntime140_1.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/msvcp140.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/vcruntime140.dll build/windows/x64/runner/Release/ + Copy-Item ../support/build/windows/x64/vcruntime140_1.dll build/windows/x64/runner/Release/ - name: Zip compiled files working-directory: app diff --git a/scripts/appimage/AppImageBuilder_arm_64.yml b/support/build/appimage/AppImageBuilder_arm_64.yml similarity index 100% rename from scripts/appimage/AppImageBuilder_arm_64.yml rename to support/build/appimage/AppImageBuilder_arm_64.yml diff --git a/scripts/appimage/AppImageBuilder_x86_64.yml b/support/build/appimage/AppImageBuilder_x86_64.yml similarity index 100% rename from scripts/appimage/AppImageBuilder_x86_64.yml rename to support/build/appimage/AppImageBuilder_x86_64.yml diff --git a/scripts/dmg/background.png b/support/build/dmg/background.png similarity index 100% rename from scripts/dmg/background.png rename to support/build/dmg/background.png diff --git a/scripts/Languages/ChineseSimplified.isl b/support/build/windows/inno/ChineseSimplified.isl similarity index 100% rename from scripts/Languages/ChineseSimplified.isl rename to support/build/windows/inno/ChineseSimplified.isl diff --git a/scripts/windows/x64/msvcp140.dll b/support/build/windows/x64/msvcp140.dll similarity index 100% rename from scripts/windows/x64/msvcp140.dll rename to support/build/windows/x64/msvcp140.dll diff --git a/scripts/windows/x64/vcruntime140.dll b/support/build/windows/x64/vcruntime140.dll similarity index 100% rename from scripts/windows/x64/vcruntime140.dll rename to support/build/windows/x64/vcruntime140.dll diff --git a/scripts/windows/x64/vcruntime140_1.dll b/support/build/windows/x64/vcruntime140_1.dll similarity index 100% rename from scripts/windows/x64/vcruntime140_1.dll rename to support/build/windows/x64/vcruntime140_1.dll diff --git a/scripts/compile_android_apk.sh b/support/scripts/compile_android_apk.sh similarity index 100% rename from scripts/compile_android_apk.sh rename to support/scripts/compile_android_apk.sh diff --git a/scripts/compile_android_appbundle.ps1 b/support/scripts/compile_android_appbundle.ps1 similarity index 100% rename from scripts/compile_android_appbundle.ps1 rename to support/scripts/compile_android_appbundle.ps1 diff --git a/scripts/compile_ios.sh b/support/scripts/compile_ios.sh similarity index 100% rename from scripts/compile_ios.sh rename to support/scripts/compile_ios.sh diff --git a/scripts/compile_linux_appimage.sh b/support/scripts/compile_linux_appimage.sh similarity index 100% rename from scripts/compile_linux_appimage.sh rename to support/scripts/compile_linux_appimage.sh diff --git a/scripts/compile_mac_appstore.sh b/support/scripts/compile_mac_appstore.sh similarity index 100% rename from scripts/compile_mac_appstore.sh rename to support/scripts/compile_mac_appstore.sh diff --git a/scripts/compile_mac_dmg.sh b/support/scripts/compile_mac_dmg.sh similarity index 95% rename from scripts/compile_mac_dmg.sh rename to support/scripts/compile_mac_dmg.sh index 113dc1ce..7c18371e 100644 --- a/scripts/compile_mac_dmg.sh +++ b/support/scripts/compile_mac_dmg.sh @@ -23,7 +23,7 @@ rm -f LocalSend.dmg create-dmg \ --volname "LocalSend" \ --window-size 500 300 \ - --background "../scripts/dmg/background.png" \ + --background "../support/build/dmg/background.png" \ --icon LocalSend.app 130 110 \ --app-drop-link 360 110 \ LocalSend.dmg \ diff --git a/scripts/compile_windows_exe-inno.iss b/support/scripts/compile_windows_exe-inno.iss similarity index 98% rename from scripts/compile_windows_exe-inno.iss rename to support/scripts/compile_windows_exe-inno.iss index 4004a494..5c1647cf 100644 --- a/scripts/compile_windows_exe-inno.iss +++ b/support/scripts/compile_windows_exe-inno.iss @@ -64,7 +64,7 @@ Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" -Name: "chinesesimplified"; MessagesFile: ".\Languages\ChineseSimplified.isl" +Name: "chinesesimplified"; MessagesFile: "..\build\windows\inno\ChineseSimplified.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked diff --git a/scripts/compile_windows_exe.ps1 b/support/scripts/compile_windows_exe.ps1 similarity index 84% rename from scripts/compile_windows_exe.ps1 rename to support/scripts/compile_windows_exe.ps1 index aa5fcf4b..5930bfd3 100644 --- a/scripts/compile_windows_exe.ps1 +++ b/support/scripts/compile_windows_exe.ps1 @@ -13,9 +13,9 @@ Copy-Item -Path "assets\packaging\logo.ico" -Destination "D:\inno" cd .. -Copy-Item -Path "scripts\windows\x64\*" -Destination "D:\inno" -Recurse +Copy-Item -Path "support\build\windows\x64\*" -Destination "D:\inno" -Recurse Remove-Item "D:\inno-result" -Force -Recurse -ErrorAction SilentlyContinue New-Item -ItemType Directory -Force -Path "D:\inno-result" -iscc .\scripts\compile_windows_exe-inno.iss +iscc .\support\scripts\compile_windows_exe-inno.iss Write-Output 'Generated Windows exe installer!' diff --git a/scripts/compile_windows_msix_helper.ps1 b/support/scripts/compile_windows_msix_helper.ps1 similarity index 100% rename from scripts/compile_windows_msix_helper.ps1 rename to support/scripts/compile_windows_msix_helper.ps1 diff --git a/scripts/compile_windows_msix_signed.ps1 b/support/scripts/compile_windows_msix_signed.ps1 similarity index 100% rename from scripts/compile_windows_msix_signed.ps1 rename to support/scripts/compile_windows_msix_signed.ps1 diff --git a/scripts/compile_windows_msix_store.ps1 b/support/scripts/compile_windows_msix_store.ps1 similarity index 100% rename from scripts/compile_windows_msix_store.ps1 rename to support/scripts/compile_windows_msix_store.ps1 diff --git a/scripts/compile_windows_zip.ps1 b/support/scripts/compile_windows_zip.ps1 similarity index 100% rename from scripts/compile_windows_zip.ps1 rename to support/scripts/compile_windows_zip.ps1 diff --git a/scripts/contributions_digester.dart b/support/scripts/contributions_digester.dart similarity index 100% rename from scripts/contributions_digester.dart rename to support/scripts/contributions_digester.dart diff --git a/scripts/download_windows_msix.ps1 b/support/scripts/download_windows_msix.ps1 similarity index 66% rename from scripts/download_windows_msix.ps1 rename to support/scripts/download_windows_msix.ps1 index 3f94afae..53254d1d 100644 --- a/scripts/download_windows_msix.ps1 +++ b/support/scripts/download_windows_msix.ps1 @@ -1,4 +1,4 @@ # Downloads the MSIX signed by Microsoft # This is useful to publish the MSIX outside of the store # Original script can be found in https://github.com/MattiasC85/Scripts/blob/master/OSD/Download-AppxFromStore.ps1 -.\scripts\msix\msix_downloader.ps1 -StoreURL https://www.microsoft.com/store/productId/9NCB4Z0TZ6RR +.\support\scripts\msix\msix_downloader.ps1 -StoreURL https://www.microsoft.com/store/productId/9NCB4Z0TZ6RR diff --git a/scripts/msix/msix_downloader.ps1 b/support/scripts/msix/msix_downloader.ps1 similarity index 100% rename from scripts/msix/msix_downloader.ps1 rename to support/scripts/msix/msix_downloader.ps1 diff --git a/scripts/remove_proprietary_dependencies.sh b/support/scripts/remove_proprietary_dependencies.sh similarity index 100% rename from scripts/remove_proprietary_dependencies.sh rename to support/scripts/remove_proprietary_dependencies.sh diff --git a/scripts/verify_exe_signature.ps1 b/support/scripts/verify_exe_signature.ps1 similarity index 100% rename from scripts/verify_exe_signature.ps1 rename to support/scripts/verify_exe_signature.ps1