[arch-commits] Commit in v2ray/trunk (PKGBUILD v2ray.service)

[Felix Yan]

    Date: Sunday, November 4, 2018 @ 18:22:34
  Author: felixonmars
Revision: 401496

upgpkg: v2ray 4.0.2-1

Modified:
  v2ray/trunk/PKGBUILD
  v2ray/trunk/v2ray.service

---------------+
 PKGBUILD      |   12 +++++++-----
 v2ray.service |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-04 18:22:27 UTC (rev 401495)
+++ PKGBUILD	2018-11-04 18:22:34 UTC (rev 401496)
@@ -2,8 +2,8 @@
 # Contributor: pandada8 <pandada8 at gmail.com>
 
 pkgname=v2ray
-pkgver=4.0
-pkgrel=2
+pkgver=4.0.2
+pkgrel=1
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
 url="https://github.com/v2ray/v2ray-core"
@@ -13,8 +13,8 @@
 backup=(etc/v2ray/config.json)
 source=("$pkgname-$pkgver.zip::https://github.com/v2ray/v2ray-core/releases/download/v$pkgver/src_all.zip"
         'v2ray.service')
-sha512sums=('af16a2869b3c82b52fc80d5edec7a6653ddab15a86cf3597fe09eb931bc1d37fd245a1e1b5fac61abfda11a4d81648beb2fa94f5338900197f299ada7b806589'
-            'ddf312c4af1ab31a54bcc037f0e78272193aa0dca66ed57066ec8c69d44f93559e9833a4c79becdd746557d9660474762f560dbe8ba21956432f09eb2d7c6ada')
+sha512sums=('e8bd2b1bdf4549f133f80994fbe42f69bea92956c745affb2d89b740fd396cd3efb67dd8363cf5d5ad8cf104d1d05e080d8c5d2a40c282e8fe8b3be65e80a795'
+            '37efc20ef71147f4400eba2bf57766462b5803b5952768bd32d5224f35e37c9c5639aaa19e0f3b63b52063dafd0381f40e2bfbb60dace08b055f0b3245cfa2b7')
 
 prepare() {
   export GOPATH="$srcdir/build"
@@ -37,7 +37,9 @@
   cd "$GOPATH"/src/v2ray.com/core
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/v2ray/LICENSE
   install -Dm644 release/config/systemd/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service
-  sed -i '/ExecStart/i Environment=v2ray_location_asset=/etc/v2ray' "$pkgdir"/usr/lib/systemd/system/v2ray.service
+  sed -i -e '/ExecStart/i Environment=V2RAY_LOCATION_ASSET=/etc/v2ray' \
+         -e 's|/usr/bin/v2ray/v2ray|/usr/bin/v2ray|' \
+         "$pkgdir"/usr/lib/systemd/system/v2ray.service
   install -Dm644 release/config/geoip.dat release/config/geosite.dat release/config/*.json -t "$pkgdir"/etc/v2ray/
   install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/bin/
   install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/bin/

Modified: v2ray.service
===================================================================
--- v2ray.service	2018-11-04 18:22:27 UTC (rev 401495)
+++ v2ray.service	2018-11-04 18:22:34 UTC (rev 401496)
@@ -6,7 +6,7 @@
 [Service]
 Type=simple
 PIDFile=/var/run/v2ray-%i.pid
-Environment=v2ray_location_asset=/etc/v2ray
+Environment=V2RAY_LOCATION_ASSET=/etc/v2ray
 ExecStart=/usr/bin/v2ray -config /etc/v2ray/%i.json
 Restart=on-failure