diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5b6f0e07..147cfb1f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,136 +1,136 @@ -name: Go -on: - push: - tags: - - v* -env: - NAME: v2raya - DESC: "A V2Ray linux GUI client, which support transparent proxy .\nhttps://github.com/mzz2017/v2raya" - SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} - -jobs: - - build: - name: Build - runs-on: ubuntu-16.04 - steps: - - name: Get the version - id: tag - run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) - - - name: Set up Go 1.13 - uses: actions/setup-go@v1 - with: - go-version: 1.13 - id: go - - - name: Setup Ruby for use with actions - uses: actions/setup-ruby@v1.0.0 - - - name: Setup Node.js for use with actions - uses: actions/setup-node@v1.1.0 - - - name: Dependencies - run: | - sudo apt-get update - sudo apt-get install -y bsdtar rpm reprepro gnupg2 expect -# go get github.com/mitchellh/gox -# gem install fpm -# npm i -g yarn - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - name: Before Deploy - run: | - if [[ $(pwd) =~ /apt$ ]]; then - echo 'Now in subdir "apt"' - cp -rf ../install/key ../install/conf ./; - else - mkdir -p apt/incoming && cp -r install/key install/conf apt/ && cd apt; - fi - gpg2 --version - gpg2 --import key/public-key.asc - cat ~/.gnupg/gpg.conf - ../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_i386_$VERSION.deb - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_amd64_$VERSION.deb - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm_$VERSION.deb - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm64_$VERSION.deb - cd ../ - export bp=$(pwd) - - name: Build - run: | - export VERSION=${{ steps.tag.outputs.VERSION }} - export PATH=$PATH:$HOME/go/bin - cd service && gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../{{.Dir}}_{{.OS}}_{{.Arch}}_$VERSION" - cd ../ - files="install/v2raya.service=/etc/systemd/system/v2raya.service gui/public/img/icons/android-chrome-512x512.png=/usr/share/icons/v2raya.png install/v2raya.desktop=/usr/share/applications/v2raya.desktop" - params="--verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/mzz2017/v2raya --maintainer mzz2017 --after-install install/after_install.sh --after-upgrade install/after_upgrade.sh --before-remove install/before_remove.sh --after-remove install/after_remove.sh" - fpm -s dir -t deb -p installer_debian_i386_$VERSION.deb --description "$DESC" $params --architecture i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t deb -p installer_debian_amd64_$VERSION.deb --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t deb -p installer_debian_arm_$VERSION.deb --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t deb -p installer_debian_arm64_$VERSION.deb --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t rpm -p installer_redhat_i386_$VERSION.rpm --description "$DESC" $params --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t rpm -p installer_redhat_amd64_$VERSION.rpm --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t rpm -p installer_redhat_arm_$VERSION.rpm --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t rpm -p installer_redhat_arm64_$VERSION.rpm --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t pacman -p installer_archlinux_i386_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t pacman -p installer_archlinux_amd64_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t pacman -p installer_archlinux_arm_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t pacman -p installer_archlinux_arm64_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t freebsd -p installer_freebsd_i386_$VERSION.txz $params --description "$DESC" --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t freebsd -p installer_freebsd_amd64_$VERSION.txz $params --description "$DESC" --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t freebsd -p installer_freebsd_arm_$VERSION.txz $params --description "$DESC" --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t freebsd -p installer_freebsd_arm64_$VERSION.txz $params --description "$DESC" --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files - cd gui && yarn && yarn build && cd ../ - - - - - name: Deploy APT - uses: ad-m/github-push-action@v0.5.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: apt - force: true - directory: apt - - - name: Deploy v.mzz.pub - uses: ad-m/github-push-action@v0.5.0 - with: - github_token: ${{ secrets.ACROSS_TOKEN }} - repository: mzz2017/v2raya-web - branch: master - force: true - directory: web - - - name: GH Release - uses: softprops/action-gh-release@v0.1.5 - with: - files: | - V2RayA_linux_386_${{ steps.tag.outputs.VERSION }} - V2RayA_linux_amd64_${{ steps.tag.outputs.VERSION }} - V2RayA_linux_arm_${{ steps.tag.outputs.VERSION }} - V2RayA_linux_arm64_${{ steps.tag.outputs.VERSION }} - installer_debian_i386_${{ steps.tag.outputs.VERSION }}.deb - installer_debian_amd64_${{ steps.tag.outputs.VERSION }}.deb - installer_debian_arm_${{ steps.tag.outputs.VERSION }}.deb - installer_debian_arm64_${{ steps.tag.outputs.VERSION }}.deb - installer_freebsd_i386_${{ steps.tag.outputs.VERSION }}.txz - installer_freebsd_amd64_${{ steps.tag.outputs.VERSION }}.txz - installer_freebsd_arm_${{ steps.tag.outputs.VERSION }}.txz - installer_freebsd_arm64_${{ steps.tag.outputs.VERSION }}.txz - installer_redhat_i386_${{ steps.tag.outputs.VERSION }}.rpm - installer_redhat_amd64_${{ steps.tag.outputs.VERSION }}.rpm - installer_redhat_arm_${{ steps.tag.outputs.VERSION }}.rpm - installer_redhat_arm64_${{ steps.tag.outputs.VERSION }}.rpm - installer_archlinux_i386_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz - installer_archlinux_amd64_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz - installer_archlinux_arm_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz - installer_archlinux_arm64_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz - - - name: Deploy AUR - run: bash install/aur.sh - - - +#name: Go +#on: +# push: +# tags: +# - v* +#env: +# NAME: v2raya +# DESC: "A V2Ray linux GUI client, which support transparent proxy .\nhttps://github.com/mzz2017/v2raya" +# SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} +# +#jobs: +# +# build: +# name: Build +# runs-on: ubuntu-16.04 +# steps: +# - name: Get the version +# id: tag +# run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) +# +# - name: Set up Go 1.13 +# uses: actions/setup-go@v1 +# with: +# go-version: 1.13 +# id: go +# +# - name: Setup Ruby for use with actions +# uses: actions/setup-ruby@v1.0.0 +# +# - name: Setup Node.js for use with actions +# uses: actions/setup-node@v1.1.0 +# +# - name: Dependencies +# run: | +# sudo apt-get update +# sudo apt-get install -y bsdtar rpm reprepro gnupg2 expect +## go get github.com/mitchellh/gox +## gem install fpm +## npm i -g yarn +# +# - name: Check out code into the Go module directory +# uses: actions/checkout@v2 +# - name: Before Deploy +# run: | +# if [[ $(pwd) =~ /apt$ ]]; then +# echo 'Now in subdir "apt"' +# cp -rf ../install/key ../install/conf ./; +# else +# mkdir -p apt/incoming && cp -r install/key install/conf apt/ && cd apt; +# fi +# gpg2 --version +# gpg2 --import key/public-key.asc +# cat ~/.gnupg/gpg.conf +# ../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_i386_$VERSION.deb +# ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_amd64_$VERSION.deb +# ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm_$VERSION.deb +# ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm64_$VERSION.deb +# cd ../ +# export bp=$(pwd) +# - name: Build +# run: | +# export VERSION=${{ steps.tag.outputs.VERSION }} +# export PATH=$PATH:$HOME/go/bin +# cd service && gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../{{.Dir}}_{{.OS}}_{{.Arch}}_$VERSION" +# cd ../ +# files="install/v2raya.service=/etc/systemd/system/v2raya.service gui/public/img/icons/android-chrome-512x512.png=/usr/share/icons/v2raya.png install/v2raya.desktop=/usr/share/applications/v2raya.desktop" +# params="--verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/mzz2017/v2raya --maintainer mzz2017 --after-install install/after_install.sh --after-upgrade install/after_upgrade.sh --before-remove install/before_remove.sh --after-remove install/after_remove.sh" +# fpm -s dir -t deb -p installer_debian_i386_$VERSION.deb --description "$DESC" $params --architecture i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t deb -p installer_debian_amd64_$VERSION.deb --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t deb -p installer_debian_arm_$VERSION.deb --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t deb -p installer_debian_arm64_$VERSION.deb --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t rpm -p installer_redhat_i386_$VERSION.rpm --description "$DESC" $params --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t rpm -p installer_redhat_amd64_$VERSION.rpm --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t rpm -p installer_redhat_arm_$VERSION.rpm --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t rpm -p installer_redhat_arm64_$VERSION.rpm --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t pacman -p installer_archlinux_i386_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t pacman -p installer_archlinux_amd64_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t pacman -p installer_archlinux_arm_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t pacman -p installer_archlinux_arm64_$VERSION.pkg.tar.xz --description "$DESC" $params --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t freebsd -p installer_freebsd_i386_$VERSION.txz $params --description "$DESC" --architecture=i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t freebsd -p installer_freebsd_amd64_$VERSION.txz $params --description "$DESC" --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t freebsd -p installer_freebsd_arm_$VERSION.txz $params --description "$DESC" --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files +# fpm -s dir -t freebsd -p installer_freebsd_arm64_$VERSION.txz $params --description "$DESC" --architecture=arm64 V2RayA_linux_arm64_$VERSION=/usr/bin/v2raya $files +# cd gui && yarn && yarn build && cd ../ +# +# +# +# - name: Deploy APT +# uses: ad-m/github-push-action@v0.5.0 +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# branch: apt +# force: true +# directory: apt +# +# - name: Deploy v.mzz.pub +# uses: ad-m/github-push-action@v0.5.0 +# with: +# github_token: ${{ secrets.ACROSS_TOKEN }} +# repository: mzz2017/v2raya-web +# branch: master +# force: true +# directory: web +# +# - name: GH Release +# uses: softprops/action-gh-release@v0.1.5 +# with: +# files: | +# V2RayA_linux_386_${{ steps.tag.outputs.VERSION }} +# V2RayA_linux_amd64_${{ steps.tag.outputs.VERSION }} +# V2RayA_linux_arm_${{ steps.tag.outputs.VERSION }} +# V2RayA_linux_arm64_${{ steps.tag.outputs.VERSION }} +# installer_debian_i386_${{ steps.tag.outputs.VERSION }}.deb +# installer_debian_amd64_${{ steps.tag.outputs.VERSION }}.deb +# installer_debian_arm_${{ steps.tag.outputs.VERSION }}.deb +# installer_debian_arm64_${{ steps.tag.outputs.VERSION }}.deb +# installer_freebsd_i386_${{ steps.tag.outputs.VERSION }}.txz +# installer_freebsd_amd64_${{ steps.tag.outputs.VERSION }}.txz +# installer_freebsd_arm_${{ steps.tag.outputs.VERSION }}.txz +# installer_freebsd_arm64_${{ steps.tag.outputs.VERSION }}.txz +# installer_redhat_i386_${{ steps.tag.outputs.VERSION }}.rpm +# installer_redhat_amd64_${{ steps.tag.outputs.VERSION }}.rpm +# installer_redhat_arm_${{ steps.tag.outputs.VERSION }}.rpm +# installer_redhat_arm64_${{ steps.tag.outputs.VERSION }}.rpm +# installer_archlinux_i386_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz +# installer_archlinux_amd64_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz +# installer_archlinux_arm_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz +# installer_archlinux_arm64_${{ steps.tag.outputs.VERSION }}.pkg.tar.xz +# +# - name: Deploy AUR +# run: bash install/aur.sh +# +# +# diff --git a/.travis.yml b/.travis.yml index 93abda19..6a138446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,8 @@ install: script: - cd service && gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../{{.Dir}}_{{.OS}}_{{.Arch}}_$VERSION" - cd ../ - - files="install/v2raya.service=/etc/systemd/system/v2raya.service gui/public/img/icons/android-chrome-512x512.png=/usr/share/icons/v2raya.png install/v2raya.desktop=/usr/share/applications/v2raya.desktop" - - params="--verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/mzz2017/v2raya --maintainer mzz2017 --after-install install/after_install.sh --after-upgrade install/after_upgrade.sh --before-remove install/before_remove.sh --after-remove install/after_remove.sh" + - files="install/universal/v2raya.service=/etc/systemd/system/v2raya.service gui/public/img/icons/android-chrome-512x512.png=/usr/share/icons/v2raya.png install/universal/v2raya.desktop=/usr/share/applications/v2raya.desktop" + - params="--verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/mzz2017/v2raya --maintainer mzz2017 --after-install install/universal/after_install.sh --after-upgrade install/universal/after_upgrade.sh --before-remove install/universal/before_remove.sh --after-remove install/universal/after_remove.sh" - fpm -s dir -t deb -p installer_debian_i386_$VERSION.deb --description "$DESC" $params --architecture i386 V2RayA_linux_386_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t deb -p installer_debian_amd64_$VERSION.deb --description "$DESC" $params --architecture=amd64 V2RayA_linux_amd64_$VERSION=/usr/bin/v2raya $files - fpm -s dir -t deb -p installer_debian_arm_$VERSION.deb --description "$DESC" $params --architecture=arm V2RayA_linux_arm_$VERSION=/usr/bin/v2raya $files @@ -56,17 +56,17 @@ script: before_deploy: if [[ $(pwd) =~ /apt$ ]]; then echo 'Now in subdir "apt"' && - cp -rf ../install/key ../install/conf ./; + cp -rf ../install/debian/key ../install/debian/conf ./; else - mkdir -p apt/incoming && cp -r install/key install/conf apt/ && cd apt; + mkdir -p apt/incoming && cp -r install/debian/key install/debian/conf apt/ && cd apt; fi && 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_i386_$VERSION.deb && - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_amd64_$VERSION.deb && - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm_$VERSION.deb && - ../install/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm64_$VERSION.deb && + ../install/tool/gpg2_expect --allow-secret-key-import --import ../install/debian/private-key.asc && + ../install/tool/reprepro_expect --ask-passphrase -Vb . export && + ../install/tool/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_i386_$VERSION.deb && + ../install/tool/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_amd64_$VERSION.deb && + ../install/tool/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm_$VERSION.deb && + ../install/tool/reprepro_expect --ask-passphrase -Vb . includedeb v2raya ../installer_debian_arm64_$VERSION.deb && cd ../ && export bp=$(pwd) @@ -118,6 +118,6 @@ deploy: on: tags: true - provider: script - script: bash install/aur.sh + script: bash install/aur/deploy.sh on: tags: true diff --git a/install/.INSTALL b/install/aur/.INSTALL similarity index 100% rename from install/.INSTALL rename to install/aur/.INSTALL diff --git a/install/.SRCINFO b/install/aur/.SRCINFO similarity index 100% rename from install/.SRCINFO rename to install/aur/.SRCINFO diff --git a/install/PKGBUILD b/install/aur/PKGBUILD similarity index 81% rename from install/PKGBUILD rename to install/aur/PKGBUILD index 69af2127..10288f64 100644 --- a/install/PKGBUILD +++ b/install/aur/PKGBUILD @@ -23,9 +23,9 @@ build() { package() { cd "V2RayA-$pkgver" - install -Dm644 "install/v2raya.service" "$pkgdir/usr/lib/systemd/system/v2raya.service" + install -Dm644 "install/universal/v2raya.service" "$pkgdir/usr/lib/systemd/system/v2raya.service" install -Dm755 "service/v2raya" -t "$pkgdir/usr/bin/" install -Dm644 "gui/public/img/icons/android-chrome-512x512.png" "$pkgdir/usr/share/icons/v2raya.png" - install -Dm755 "install/v2raya.desktop" -t "$pkgdir/usr/share/applications/" + install -Dm755 "install/universal/v2raya.desktop" -t "$pkgdir/usr/share/applications/" } diff --git a/install/aur.sh b/install/aur/deploy.sh similarity index 75% rename from install/aur.sh rename to install/aur/deploy.sh index 5be39731..31ca96b2 100644 --- a/install/aur.sh +++ b/install/aur/deploy.sh @@ -1,11 +1,11 @@ #!/bin/bash eval $(ssh-agent) -chmod 600 ./install/deploy_key -./install/ssh-add_expect ./install/deploy_key +chmod 600 ./install/aur/deploy_key +./install/tool/ssh-add_expect ./install/aur/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')" -cp -f install/PKGBUILD install/.SRCINFO install/.INSTALL /tmp/ +cp -f install/aur/PKGBUILD install/aur/.SRCINFO install/aur/.INSTALL /tmp/ cd /tmp/ git clone ssh://aur@aur.archlinux.org/v2raya.git sudo cp -f /tmp/PKGBUILD /tmp/.SRCINFO /tmp/.INSTALL /tmp/v2raya/ diff --git a/install/deploy_key b/install/aur/deploy_key similarity index 100% rename from install/deploy_key rename to install/aur/deploy_key diff --git a/install/deploy_key.pub b/install/aur/deploy_key.pub similarity index 100% rename from install/deploy_key.pub rename to install/aur/deploy_key.pub diff --git a/install/conf/distributions b/install/debian/conf/distributions similarity index 100% rename from install/conf/distributions rename to install/debian/conf/distributions diff --git a/install/key/public-key.asc b/install/debian/key/public-key.asc similarity index 100% rename from install/key/public-key.asc rename to install/debian/key/public-key.asc diff --git a/install/private-key.asc b/install/debian/private-key.asc similarity index 100% rename from install/private-key.asc rename to install/debian/private-key.asc diff --git a/install/gpg2_expect b/install/tool/gpg2_expect similarity index 100% rename from install/gpg2_expect rename to install/tool/gpg2_expect diff --git a/install/reprepro_expect b/install/tool/reprepro_expect similarity index 100% rename from install/reprepro_expect rename to install/tool/reprepro_expect diff --git a/install/ssh-add_expect b/install/tool/ssh-add_expect similarity index 100% rename from install/ssh-add_expect rename to install/tool/ssh-add_expect diff --git a/install/after_install.sh b/install/universal/after_install.sh similarity index 100% rename from install/after_install.sh rename to install/universal/after_install.sh diff --git a/install/after_remove.sh b/install/universal/after_remove.sh similarity index 100% rename from install/after_remove.sh rename to install/universal/after_remove.sh diff --git a/install/after_upgrade.sh b/install/universal/after_upgrade.sh similarity index 100% rename from install/after_upgrade.sh rename to install/universal/after_upgrade.sh diff --git a/install/before_remove.sh b/install/universal/before_remove.sh similarity index 100% rename from install/before_remove.sh rename to install/universal/before_remove.sh diff --git a/install/v2raya.desktop b/install/universal/v2raya.desktop similarity index 100% rename from install/v2raya.desktop rename to install/universal/v2raya.desktop diff --git a/install/v2raya.service b/install/universal/v2raya.service similarity index 100% rename from install/v2raya.service rename to install/universal/v2raya.service diff --git a/service/model/touch/touch.go b/service/model/touch/touch.go index c5f04e41..bc3f541c 100644 --- a/service/model/touch/touch.go +++ b/service/model/touch/touch.go @@ -35,7 +35,7 @@ type Subscription struct { } func NewUpdateStatus() SubscriptionStatus { - return SubscriptionStatus("上次更新:" + time.Now().Local().Format("2006-1-2 15:04:05")) + return SubscriptionStatus(time.Now().Local().Format("2006-1-2 15:04:05")) } func NewUpdateFailStatus(reason string) SubscriptionStatus { return SubscriptionStatus(time.Now().Local().Format("2006-1-2 15:04:05") + "尝试更新失败:" + reason)