From a2010e6d1d0037a8d3415687a5c5dab4b5e14f20 Mon Sep 17 00:00:00 2001 From: coolcoala Date: Wed, 30 Jul 2025 08:01:56 +0300 Subject: [PATCH] fixed renaming files --- .github/workflows/release.yml | 78 +++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfc28ad9..f5fe12e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,30 +86,30 @@ jobs: ## Which version should I download? ### macOS -
-
+
+
> :warning: **Warning** If you get a notification that the application is corrupted when you run it on macOS, run this command:
sudo xattr -r -c /Applications/Clash\ Verge\ Rev\ Lite.app ### Linux -
- +
+ -
- +
+ -
- +
+ ### Windows (Win7 is no longer supported) #### Normal version (recommended) -
- +
+ #### Portable version is no longer available with many problems #### Built-in Webview version 2 (large size, only used in enterprise version of the system or can not install webview2) -
- +
+ Created at ${{ env.BUILDTIME }}. EOF @@ -197,7 +197,7 @@ jobs: $version = ${{steps.build.outputs.appVersion}} $files = Get-ChildItem ".\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\*-setup.exe" foreach ($file in $files) { - $newName = $file.Name replace "_${version}_", "_" + $newName = $file.Name -replace "_${version}_", "_" Rename-Item $file.FullName $newName } @@ -205,13 +205,25 @@ jobs: if: runner.os == 'Linux' || runner.os == 'macOS' shell: bash run: | - VERSION=${{steps.build.outputs.appVersion}} - old_path=$(find src-tauri/target/release/bundle -type f \(-o -name "*.dmg" -o -name "*.deb" -o -name "*.rpm" \) -print -quit) + TARGET_DIR="src-tauri/target/${{ matrix.target }}/release/bundle" - new_path=$(echo "$old_path" | sed -E "s/-${VERSION}-1//g" | sed -E "s/_${VERSION}_//g" | sed -E "s/-${VERSION}-//g") + if [ ! -d "$TARGET_DIR" ]; then + exit 1 + fi - echo "Renaming '$old_path' to '$new_path'" - mv "$old_path" "$new_path" + find "$TARGET_DIR" -type f \( -name "*.dmg" -o -name "*.deb" -o -name "*.rpm" \) -print0 | while IFS= read -r -d '' old_path; do + dir_path=$(dirname "$old_path") + old_filename=$(basename "$old_path") + new_filename=$(echo "$old_filename" \ + | sed -E 's/_[0-9]+\.[0-9]+\.[0-9]+_/_/' \ + | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+//' \ + ) + new_path="${dir_path}/${new_filename}" + if [ "$old_path" != "$new_path" ]; then + echo " - '$old_filename' -> '$new_filename'" + mv "$old_path" "$new_path" + fi + done - name: Upload Release uses: softprops/action-gh-release@v2 @@ -223,6 +235,7 @@ jobs: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup* + src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg release-for-linux-arm: name: Release Build for Linux ARM @@ -335,6 +348,29 @@ jobs: echo "VERSION=$(cat package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV echo "BUILDTIME=$(TZ=Europe/Moscow date)" >> $GITHUB_ENV + - name: Rename + shell: bash + run: | + TARGET_DIR="src-tauri/target/${{ matrix.target }}/release/bundle" + + if [ ! -d "$TARGET_DIR" ]; then + exit 1 + fi + + find "$TARGET_DIR" -type f \( -name "*.dmg" -o -name "*.deb" -o -name "*.rpm" \) -print0 | while IFS= read -r -d '' old_path; do + dir_path=$(dirname "$old_path") + old_filename=$(basename "$old_path") + new_filename=$(echo "$old_filename" \ + | sed -E 's/_[0-9]+\.[0-9]+\.[0-9]+_/_/' \ + | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+//' \ + ) + new_path="${dir_path}/${new_filename}" + if [ "$old_path" != "$new_path" ]; then + echo " - '$old_filename' -> '$new_filename'" + mv "$old_path" "$new_path" + fi + done + - name: Upload Release uses: softprops/action-gh-release@v2 with: @@ -409,19 +445,19 @@ jobs: run: | $files = Get-ChildItem ".\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\*-setup.exe" foreach ($file in $files) { - $newName = $file.Name -replace "-setup\.exe$", "_fixed_webview2-setup.exe" + $newName = $file.Name -replace "_${{steps.build.outputs.appVersion}}_", "_" -replace "-setup\.exe$", "_fixed_webview2-setup.exe" Rename-Item $file.FullName $newName } $files = Get-ChildItem ".\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\*.nsis.zip" foreach ($file in $files) { - $newName = $file.Name -replace "-setup\.nsis\.zip$", "_fixed_webview2-setup.nsis.zip" + $newName = $file.Name -replace "_${{steps.build.outputs.appVersion}}_", "_" -replace "-setup\.nsis\.zip$", "_fixed_webview2-setup.nsis.zip" Rename-Item $file.FullName $newName } $files = Get-ChildItem ".\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\*-setup.exe.sig" foreach ($file in $files) { - $newName = $file.Name -replace "-setup\.exe\.sig$", "_fixed_webview2-setup.exe.sig" + $newName = $file.Name -replace "_${{steps.build.outputs.appVersion}}_", "_" -replace "-setup\.exe\.sig$", "_fixed_webview2-setup.exe.sig" Rename-Item $file.FullName $newName }