From 3cc6027bad500c861cbe345d39196e44d388e4dd Mon Sep 17 00:00:00 2001 From: koll zhu Date: Sun, 19 Jan 2025 22:37:27 +0800 Subject: [PATCH] sync cg3s --- .github/workflows/winget-publish.yml | 4 ++-- README.md | 29 ++++++++++++++++++---------- package-debian.sh | 4 ++-- package-osx.sh | 4 ++-- package-release-zip.sh | 2 +- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/winget-publish.yml b/.github/workflows/winget-publish.yml index 5041cd5e..0c4fdc97 100644 --- a/.github/workflows/winget-publish.yml +++ b/.github/workflows/winget-publish.yml @@ -16,10 +16,10 @@ jobs: - name: Submit v2ray package to Windows Package Manager Community Repository run: | - $wingetPackage = "2dust.v2rayN" + $wingetPackage = "cg3s.v2rayN" $gitToken = "${{ secrets.PT_WINGET }}" - $github = Invoke-RestMethod -uri "https://api.github.com/repos/2dust/v2rayN/releases" + $github = Invoke-RestMethod -uri "https://api.github.com/repos/cg3s/v2rayN/releases" $targetRelease = $github | Where-Object -Property prerelease -match 'False' | Select -First 1 $installerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64\.zip*' | Select -ExpandProperty browser_download_url diff --git a/README.md b/README.md index df12dfc7..1cf9ee45 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,43 @@ # v2rayN -A GUI client for Windows, Linux and macOS, support [Xray core](https://github.com/XTLS/Xray-core) and [sing-box-core](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores) +A GUI client for Windows, Linux and macOS, support [Xray core](https://github.com/XTLS/Xray-core) and [sing-box-core](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/cg3s/v2rayN/wiki/List-of-supported-cores) -[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master) -[![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn) -[![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases) +[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/cg3s/v2rayN)](https://github.com/cg3s/v2rayN/commits/master) +[![CodeFactor](https://www.codefactor.io/repository/github/cg3s/v2rayn/badge)](https://www.codefactor.io/repository/github/cg3s/v2rayn) +[![GitHub Releases](https://img.shields.io/github/downloads/cg3s/v2rayN/latest/total?logo=github)](https://github.com/cg3s/v2rayN/releases) [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn) - ## How to use -Check [Release files introduction](https://github.com/2dust/v2rayN/wiki/Release-files-introduction) and select the version you need to download + +Check [Release files introduction](https://github.com/cg3s/v2rayN/wiki/Release-files-introduction) and select the version you need to download + ### Windows + - Run `v2rayN.exe` + ### Linux + - `chmod +x v2rayN` Run `./v2rayN` under user permissions + ``` Debian 9+ Ubuntu 16.04+ Fedora 30+ ``` + ### macOS + - `chmod +x v2rayN` Run `./v2rayN` under user permissions + ``` macOS 11+ ``` -## Requirements -- [Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) -- [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores) +## Requirements +- [Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) +- [Supported cores](https://github.com/cg3s/v2rayN/wiki/List-of-supported-cores) ## Telegram Channel -[github_2dust](https://t.me/github_2dust) + +[github_cg3s](https://t.me/github_cg3s) diff --git a/package-debian.sh b/package-debian.sh index 568bdd88..0a961785 100644 --- a/package-debian.sh +++ b/package-debian.sh @@ -5,7 +5,7 @@ OutputPath="$2" Version="$3" FileName="v2rayN-${Arch}.zip" -wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName" +wget -nv -O $FileName "https://github.com/cg3s/v2rayN-core-bin/raw/refs/heads/master/$FileName" 7z x $FileName cp -rf v2rayN-${Arch}/* $OutputPath @@ -27,7 +27,7 @@ cat >"${PackagePath}/DEBIAN/control" <<-EOF Package: v2rayN Version: $Version Architecture: $Arch2 -Maintainer: https://github.com/2dust/v2rayN +Maintainer: https://github.com/cg3s/v2rayN Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others EOF diff --git a/package-osx.sh b/package-osx.sh index 042e29b7..838c3bbf 100755 --- a/package-osx.sh +++ b/package-osx.sh @@ -5,7 +5,7 @@ OutputPath="$2" Version="$3" FileName="v2rayN-${Arch}.zip" -wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName" +wget -nv -O $FileName "https://github.com/cg3s/v2rayN-core-bin/raw/refs/heads/master/$FileName" 7z x $FileName cp -rf v2rayN-${Arch}/* $OutputPath @@ -32,7 +32,7 @@ cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF CFBundleIconName AppIcon CFBundleIdentifier - 2dust.v2rayN + cg3s.v2rayN CFBundleName v2rayN CFBundlePackageType diff --git a/package-release-zip.sh b/package-release-zip.sh index 60804e69..5254281e 100644 --- a/package-release-zip.sh +++ b/package-release-zip.sh @@ -6,7 +6,7 @@ OutputPath="$2" OutputArch="v2rayN-${Arch}" FileName="v2rayN-${Arch}.zip" -wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName" +wget -nv -O $FileName "https://github.com/cg3s/v2rayN-core-bin/raw/refs/heads/master/$FileName" ZipPath64="./$OutputArch" mkdir $ZipPath64