From ef887a4e8ae465ff3ee205cbf9d2d20ab84945e2 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Fri, 22 Nov 2019 00:58:40 +0800 Subject: [PATCH] feat/chore: AUR support for archlinuxers --- .gitignore | 8 ++++++-- .travis.yml | 39 +++++++++++++++++++++++---------------- Dockerfile | 2 +- Dockerfile.dev | 2 +- README.md | 23 ++++++++++++++--------- install/.SRCINFO | 19 +++++++++++++++++++ install/PKGBUILD | 29 +++++++++++++++++++++++++++++ install/aur.sh | 12 ++++++++++++ install/deploy_key | 39 +++++++++++++++++++++++++++++++++++++++ install/deploy_key.pub | 1 + install/ssh-add_expect | 26 ++++++++++++++++++++++++++ 11 files changed, 171 insertions(+), 29 deletions(-) create mode 100644 install/.SRCINFO create mode 100644 install/PKGBUILD create mode 100644 install/aur.sh create mode 100644 install/deploy_key create mode 100644 install/deploy_key.pub create mode 100755 install/ssh-add_expect diff --git a/.gitignore b/.gitignore index ba7e23ca..6e71be6f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,9 @@ node_modules V2RayA_* v2raya_* installer_* -apt -V2RayA \ No newline at end of file +V2RayA + +#package +/.SRCINFO +/apt +/PKGBUILD diff --git a/.travis.yml b/.travis.yml index 9f2a80fb..1690bd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,14 +28,14 @@ install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then go get github.com/mitchellh/gox ;fi - gem install fpm script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd service && gox -osarch="linux/amd64 linux/arm" -mod=vendor -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../{{.Dir}}_{{.OS}}_{{.Arch}}" ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd service && CGO_ENABLED=0 go build -mod=vendor -a -ldflags='-extldflags "-static" -X global.Version=${VERSION:1}' -o ../V2RayA_darwin_amd64 ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd service && gox -osarch="linux/amd64 linux/arm" -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../{{.Dir}}_{{.OS}}_{{.Arch}}_$VERSION" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd service && CGO_ENABLED=0 go build -a -ldflags='-extldflags "-static" -X V2RayA/global.Version=${VERSION:1}' -o ../V2RayA_darwin_amd64_$VERSION ; fi - cd ../ - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then files="V2RayA_linux_amd64=/usr/bin/v2raya install/v2raya.service=/etc/systemd/system/v2raya.service" ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then files="V2RayA_darwin_amd64=/usr/bin/v2raya install/v2raya.service=/etc/systemd/system/v2raya.service" ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then files="V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya install/v2raya.service=/etc/systemd/system/v2raya.service" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then files="V2RayA_darwin_amd64_$VERSION=/usr/bin/v2raya install/v2raya.service=/etc/systemd/system/v2raya.service" ; fi - params="-f -n $NAME -v ${VERSION:1} --after-install install/after_install.sh --before-remove install/before_remove.sh --after-remove install/after_remove.sh --after-upgrade install/after_upgrade.sh $files" - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then fpm -s dir -t deb -p installer_debian.deb $params && fpm -s dir -t rpm -p installer_redhat.rpm $params && fpm -s dir -t pacman -p installer_arch.pkg.tar.xz $params && fpm -s dir -t freebsd -p installer_freebsd.txz $params ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo -E fpm -s dir -t osxpkg -p installer_osx.pkg $params ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then fpm -s dir -t deb -p installer_debian_$VERSION.deb $params && fpm -s dir -t rpm -p installer_redhat_$VERSION.rpm $params && fpm -s dir -t pacman -p installer_arch_$VERSION.pkg.tar.xz $params && fpm -s dir -t freebsd -p installer_freebsd_$VERSION.txz $params ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo -E fpm -s dir -t osxpkg -p installer_osx_$VERSION.pkg $params ; fi before_deploy: @@ -49,7 +49,7 @@ before_deploy: gpg2 --import key/public-key.asc && ../install/gpg2_expect --allow-secret-key-import --import ../install/private-key.asc && ../install/reprepro_expect --ask-passphrase -Vb . export && - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian.deb && + ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_$VERSION.deb && cd ../; fi @@ -64,30 +64,37 @@ deploy: on: tags: true condition: $TRAVIS_OS_NAME = linux + - provider: releases api_key: secure: dI7F0zR8lks/+Nk1RZ41V8jidKSXJRDkUFhjRkQFLO3NE2wCwlftSCEMhRa0ULqyskCmboKmVAAbCZupttFynWaj9ttpa2UWng+EfNtwEOvB0wp8b2CCV13Y/ncvaofIULWGJsjNbPAILkMp4YTfs92GslxGcLAJqAL3/P7O3Tx8AO7l7WzkVOC31sO5ZApb4kzb58T5IWY7mDZ9gSvjC4iyBGMwFG8YZXmknxTHVsDNWXvZwmScDB3VTu+X6U3aEVvdOYlmcqxDOzc8ZFGSpw6R4Dy2/KUH99UtofrF/buQauPmUq8Znu8u0LePtNI9ePxACqokPo8e+4MyE1ipVgoirgZmS2ICLnXTsSrwmNQ8S3+alOZW/+Kfo1v9Besfia9DoWUxOinRlGLVmnWFbMasRxKsqLfR2q3rSpWU4cKbH5WpxHewBnYqa86Xwp9G2O4MLpe6Ct7MLOiLonBXnUb2hXZGri8y87lTAUugxj/wSqXucw5SSDbRJT9v6Zwk5Eaj7Fc8QNTt7eqhVvmE8UucQPy1TL3gkTYFtUDkngWV0d0Y4JOHQW4ZUd28WLWIEyFoLZ8ZUT/kx87E69BhsqTq5S6tFRmWUXNLUpSrxJq29UdFy6zgNJhxgxxXXVpUH6wYHqV7nDCsZygJ5Z+iTTbkt+e1bIkhXbf/fM4+Yws= file: - - "V2RayA_linux_amd64" - - "V2RayA_linux_arm" - - "installer_debian.deb" - - "installer_freebsd.txz" - - "installer_redhat.rpm" - - "installer_arch.pkg.tar.xz" + - "V2RayA_linux_amd64_$VERSION" + - "V2RayA_linux_arm_$VERSION" + - "installer_debian_$VERSION.deb" + - "installer_freebsd_$VERSION.txz" + - "installer_redhat_$VERSION.rpm" + - "installer_arch_$VERSION.pkg.tar.xz" skip_cleanup: true overwrite: true on: tags: true condition: $TRAVIS_OS_NAME = linux + - provider: releases api_key: secure: dI7F0zR8lks/+Nk1RZ41V8jidKSXJRDkUFhjRkQFLO3NE2wCwlftSCEMhRa0ULqyskCmboKmVAAbCZupttFynWaj9ttpa2UWng+EfNtwEOvB0wp8b2CCV13Y/ncvaofIULWGJsjNbPAILkMp4YTfs92GslxGcLAJqAL3/P7O3Tx8AO7l7WzkVOC31sO5ZApb4kzb58T5IWY7mDZ9gSvjC4iyBGMwFG8YZXmknxTHVsDNWXvZwmScDB3VTu+X6U3aEVvdOYlmcqxDOzc8ZFGSpw6R4Dy2/KUH99UtofrF/buQauPmUq8Znu8u0LePtNI9ePxACqokPo8e+4MyE1ipVgoirgZmS2ICLnXTsSrwmNQ8S3+alOZW/+Kfo1v9Besfia9DoWUxOinRlGLVmnWFbMasRxKsqLfR2q3rSpWU4cKbH5WpxHewBnYqa86Xwp9G2O4MLpe6Ct7MLOiLonBXnUb2hXZGri8y87lTAUugxj/wSqXucw5SSDbRJT9v6Zwk5Eaj7Fc8QNTt7eqhVvmE8UucQPy1TL3gkTYFtUDkngWV0d0Y4JOHQW4ZUd28WLWIEyFoLZ8ZUT/kx87E69BhsqTq5S6tFRmWUXNLUpSrxJq29UdFy6zgNJhxgxxXXVpUH6wYHqV7nDCsZygJ5Z+iTTbkt+e1bIkhXbf/fM4+Yws= file: - - "V2RayA_darwin_amd64" - - "installer_osx.pkg" + - "V2RayA_darwin_amd64_$VERSION" + - "installer_osx_$VERSION.pkg" skip_cleanup: true overwrite: true on: tags: true condition: $TRAVIS_OS_NAME = osx - \ No newline at end of file + + - provider: script + script: bash install/aur.sh + on: + tags: true + condition: $TRAVIS_OS_NAME = linux \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 58853068..226ba329 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:alpine ADD ./service /service WORKDIR /service -RUN go build -mod=vendor -o V2RayA . +RUN go build -o V2RayA . ENV GIN_MODE=release EXPOSE 2017 20170-20172 ENTRYPOINT "./V2RayA" diff --git a/Dockerfile.dev b/Dockerfile.dev index 66d983cb..7e719b8c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -11,4 +11,4 @@ RUN apt-get install -y psmisc ca-certificates WORKDIR /service ENV GOPROXY=https://goproxy.io ENV CONFIG=../config.json -ENTRYPOINT gin -p 2017 -i --buildArgs -mod=vendor --bin ../V2RayA run +ENTRYPOINT gin -p 2017 -i --buildArgs --bin ../V2RayA run diff --git a/README.md b/README.md index 79d7de11..8772f8eb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ V2RayA 是 V2Ray 的一个 Web 客户端。 虽然 V2RayA 是一个 Web 客户端,它也支持以 PWA(Progressive Web App)的方式享受桌面端应用的体验。[食用方法](https://www.ithome.com/0/414/429.htm) -得益于Web客户端的优势,你只需对前端稍作修改,就可以将它部署在软路由或NAS上,并通过http访问。 +得益于Web客户端的优势,你只需对前端稍作修改就可以将它部署在软路由或NAS上,并通过http访问管理你的节点。 项目地址:https://github.com/mzz2017/V2RayA @@ -64,7 +64,7 @@ V2RayA 是 V2Ray 的一个 Web 客户端。 如下使用方法: -1. **使用apt-get安装** +1. **使用apt-get安装**(debian、ubuntu) 请确保已正确安装 v2ray-core @@ -80,16 +80,20 @@ V2RayA 是 V2Ray 的一个 Web 客户端。 # add public key wget -qO - https://raw.githubusercontent.com/mzz2017/V2RayA/apt/key/public-key.asc | sudo apt-key add - - # add V2RayA's repository sudo add-apt-repository 'deb https://raw.githubusercontent.com/mzz2017/V2RayA/apt v2raya main' sudo apt-get update - # install V2RayA sudo apt-get install v2raya ``` -2. **使用Release二进制文件/安装包**(支持常见linux系统) + +2. **使用pacman安装**(archlinux、manjaro) + ```bash + # assume command 'yay' is available. https://github.com/Jguer/yay + yay -S v2raya + ``` +3. **使用Release二进制文件/安装包**(支持常见linux系统) 请确保已正确安装 v2ray-core @@ -103,19 +107,20 @@ V2RayA 是 V2Ray 的一个 Web 客户端。 准备完毕后,可下载[Releases](https://github.com/mzz2017/V2RayA/releases)中的二进制文件启动V2RayA服务端,或下载安装包进行安装。 -3. 当然,你也可以选择拉取源码,**通过 golang 启动**: +4. 当然,你也可以选择拉取源码,**通过 golang 启动**: 该方法同样需要正确安装v2ray-core,详情见上 ```bash git clone https://github.com/mzz2017/V2RayA.git cd V2RayA/service - sudo go run -mod=vendor main.go + # export GOPROXY=https://goproxy.io + sudo go run main.go ``` 注意,尽管 golang 具有交叉编译的特性,但由于项目使用了 linux commands,导致该方法不支持 windows。若想在 windows 体验,可借助 Docker 或 WSL。 -4. 拉取源码,**使用 docker-compose 部署**,在[Web-GUI](https://v2raya.mzz.pub)使用(或手动部署 Web-GUI)。该方法不支持全局透明代理。 +5. 拉取源码,**使用 docker-compose 部署**,在[Web-GUI](https://v2raya.mzz.pub)使用(或手动部署 Web-GUI)。该方法不支持全局透明代理。 ```bash git clone https://github.com/mzz2017/V2RayA.git @@ -123,7 +128,7 @@ V2RayA 是 V2Ray 的一个 Web 客户端。 docker-compose up -d --build ``` -5. **使用 docker 命令部署**,在[Web-GUI](https://v2raya.mzz.pub)使用(或手动部署 Web-GUI)。该方法不支持全局透明代理。 +6. **使用 docker 命令部署**,在[Web-GUI](https://v2raya.mzz.pub)使用(或手动部署 Web-GUI)。该方法不支持全局透明代理。 我们同步发行[Docker 镜像](https://hub.docker.com/r/mzz2017/v2raya),如果无法使用 docker-compose,可以参考[docker-compose.yml](https://github.com/mzz2017/V2RayA/blob/master/docker-compose.yml)并使用 docker 命令自行搭建。 diff --git a/install/.SRCINFO b/install/.SRCINFO new file mode 100644 index 00000000..e940d3e3 --- /dev/null +++ b/install/.SRCINFO @@ -0,0 +1,19 @@ +pkgbase = v2raya + pkgdesc = V2RayA是一个支持全局透明代理的V2Ray Linux客户端。 + pkgver = {{pkgver}} + pkgrel = 1 + url = https://github.com/mzz2017/V2RayA + arch = i686 + arch = x86_64 + arch = armv7h + arch = armv6h + arch = aarch64 + license = GPL + makedepends = go>=2:1.11.3-1 + depends = glibc + depends = v2ray + source = v2raya-{{pkgver}}.tar.gz::https://github.com/mzz2017/V2RayA/archive/v{{pkgver}}.tar.gz + sha512sums = SKIP + +pkgname = v2raya + diff --git a/install/PKGBUILD b/install/PKGBUILD new file mode 100644 index 00000000..8fe2cd04 --- /dev/null +++ b/install/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: mzz2017 + +pkgname=v2raya +pkgver={{pkgver}} +pkgrel=1 +pkgdesc="V2RayA是一个支持全局透明代理的V2Ray Linux客户端。" +arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64') +url="https://github.com/mzz2017/V2RayA" +license=('GPL') +depends=('glibc' 'v2ray') +makedepends=('go>=2:1.11.3-1') +source=("$pkgname-$pkgver.tar.gz::https://github.com/mzz2017/V2RayA/archive/v$pkgver.tar.gz") +sha512sums=('SKIP') + +prepare() { + export GO111MODULE=on + export GOPROXY=https://goproxy.io +} + +build() { + cd "V2RayA-$pkgver/service" + go build -ldflags='-X V2RayA/global.Version=$pkgver' -o v2raya +} + +package() { + cd "V2RayA-$pkgver" + install -Dm644 "install/v2raya.service" "$pkgdir/usr/lib/systemd/system/v2raya.service" + install -Dm755 "service/v2raya" -t "$pkgdir/usr/bin/" +} diff --git a/install/aur.sh b/install/aur.sh new file mode 100644 index 00000000..19801996 --- /dev/null +++ b/install/aur.sh @@ -0,0 +1,12 @@ +cp -r install/PKGBUILD install/.SRCINFO ./ +sed -i s/{{pkgver}}/${VERSION:1}/g PKGBUILD +sed -i s/{{pkgver}}/${VERSION:1}/g .SRCINFO +eval $(ssh-agent) +chmod 600 ./install/deploy_key +./install/ssh-add_expect ./install/deploy_key +ssh-keyscan -H aur.archlinux.org >>~/.ssh/known_hosts +git config user.name "$(git show -s --format='%an')" +git config user.email "$(git show -s --format='%ae')" +git clone ssh://aur@aur.archlinux.org/v2raya.git +cp -r PKGBUILD .SRCINFO v2raya +cd v2raya && git add . && git commit -m "AUR" && git push origin master diff --git a/install/deploy_key b/install/deploy_key new file mode 100644 index 00000000..396bddc9 --- /dev/null +++ b/install/deploy_key @@ -0,0 +1,39 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +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 +v0FwDccsGsFr/6mZTPeGAKoYbng= +-----END OPENSSH PRIVATE KEY----- diff --git a/install/deploy_key.pub b/install/deploy_key.pub new file mode 100644 index 00000000..5633e58d --- /dev/null +++ b/install/deploy_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDaoK2mhwXs8XEbJars/g7z3LPsQS+ahxfOSGVQemLQRiAmJdu7kX3bzTYgVDQPPP0D6Mui21jd0QE0cPwLBFSaVP4JVLBvrdXP3ve6/zwZO0POn8aOafWlHHOn7BI1vcEj8K0JTmMX9fmigc/rK3I91fxnz2JgQvZdaODPNHARB9w+HluDYb6U/ai5miy0X5K9Epq9ci3r360mw+xRYS6BTjmXeMW/sY1EuNFidLivSJMsdtCouNnMyY0RqyUesp8XzG9gPeItQW04JyMwCrQeEuN3DdFMu2uiVIwB6Tttc0xKtNv4Xjx9X/L8esbganqsmeU8/5yyPvoJ7/Q98ePJiUPRsWgAZQH/ctLZQVQ5vyomSNjZI4UCfRudaUubL0HClGFovcnI4xK+OhxEs/KaVupyq+tWlbt5iOoIfKqB/J3bXsFSv8dG76V4bSRwhbyFrKIGq2niy/ZqAqCQ35nPKJrUHKv0zfNM1qEfkKtZLLnxYgQ4ACzT9XKiI/WAL08= mzz@mzz-pc diff --git a/install/ssh-add_expect b/install/ssh-add_expect new file mode 100755 index 00000000..f37812d6 --- /dev/null +++ b/install/ssh-add_expect @@ -0,0 +1,26 @@ +#!/usr/bin/expect -f + +set timeout 30 + +set passphrase "$env(SIGNING_PASSWORD)" + +# Call ssh-add with variable length arguments, so that this script +# takes the same arguments as the original program +spawn ssh-add {*}$argv + +expect { + timeout {send_error "\nFailed to get password prompt\n"; + exit 1} + "*assphrase*" {send -- "$passphrase\r"; + send_user " *** entering passphrase ***"; + exp_continue} +} + +# Get the pid, spawnid, oserr and exitcode from the spawned ssh-add command +set returnvalues [wait] + +# Extract the ssh-add exit code +set exitcode [lindex $returnvalues 3] + +# Exit with the exitcode from ssh-add (0 on success) +exit $exitcode \ No newline at end of file