From f809ee7b20737f898c53bab53fe31d349a9feec0 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:06:26 +0800 Subject: [PATCH] Adjust the macos package icon https://github.com/2dust/v2rayN/issues/6404 --- .github/workflows/build-linux.yml | 3 ++- .github/workflows/build-osx.yml | 3 ++- .github/workflows/build-windows.yml | 3 ++- package-osx.sh | 20 ++++++++++---------- v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj | 3 +++ v2rayN/v2rayN.Desktop/v2rayN2.png | Bin 0 -> 10324 bytes 6 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 v2rayN/v2rayN.Desktop/v2rayN2.png diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 88b89d2a2d4..913e88a9da5 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -73,4 +73,5 @@ jobs: with: file: ${{ github.workspace }}/v2rayN*.zip tag: ${{ github.event.inputs.release_tag }} - file_glob: true \ No newline at end of file + file_glob: true + prerelease: true \ No newline at end of file diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 369faabeeb1..6a50d6b4932 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -74,4 +74,5 @@ jobs: with: file: ${{ github.workspace }}/v2rayN*.zip tag: ${{ github.event.inputs.release_tag }} - file_glob: true \ No newline at end of file + file_glob: true + prerelease: true \ No newline at end of file diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 2b19e6461b4..97c4a997aa1 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -64,4 +64,5 @@ jobs: with: file: ${{ github.workspace }}/v2rayN*.zip tag: ${{ github.event.inputs.release_tag }} - file_glob: true \ No newline at end of file + file_glob: true + prerelease: true \ No newline at end of file diff --git a/package-osx.sh b/package-osx.sh index cfbd83598d1..6bd0d92294c 100755 --- a/package-osx.sh +++ b/package-osx.sh @@ -11,16 +11,16 @@ echo "When this file exists, app will not store configs under this folder" > "$P chmod +x "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN" mkdir -p "$PackagePath/icons.iconset" -sips -z 16 16 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_16x16.png" -sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_16x16@2x.png" -sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_32x32.png" -sips -z 64 64 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_32x32@2x.png" -sips -z 128 128 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_128x128.png" -sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_128x128@2x.png" -sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_256x256.png" -sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_256x256@2x.png" -sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_512x512.png" -sips -z 1024 1024 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_512x512@2x.png" +sips -z 16 16 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16.png" +sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16@2x.png" +sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32.png" +sips -z 64 64 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32@2x.png" +sips -z 128 128 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128.png" +sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128@2x.png" +sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256.png" +sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256@2x.png" +sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512.png" +sips -z 1024 1024 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512@2x.png" iconutil -c icns "$PackagePath/icons.iconset" -o "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns" cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj index bc95f8c6aca..abe7aa5b957 100644 --- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj +++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj @@ -48,6 +48,9 @@ Always + + Always + diff --git a/v2rayN/v2rayN.Desktop/v2rayN2.png b/v2rayN/v2rayN.Desktop/v2rayN2.png new file mode 100644 index 0000000000000000000000000000000000000000..d869057f833f177f32ebfb12f86a80b161e4f5f8 GIT binary patch literal 10324 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 literal 0 HcmV?d00001