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

[Felix Yan]

    Date: Sunday, November 4, 2018 @ 05:28:48
  Author: felixonmars
Revision: 401450

upgpkg: v2ray 4.0-2

fix environment assignment

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-04 02:47:36 UTC (rev 401449)
+++ PKGBUILD	2018-11-04 05:28:48 UTC (rev 401450)
@@ -3,7 +3,7 @@
 
 pkgname=v2ray
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
 url="https://github.com/v2ray/v2ray-core"
@@ -15,7 +15,7 @@
         'v2ray.service')
 sha512sums=('af16a2869b3c82b52fc80d5edec7a6653ddab15a86cf3597fe09eb931bc1d37fd245a1e1b5fac61abfda11a4d81648beb2fa94f5338900197f299ada7b806589'
             '521ae508ad221125f02f9b1116ffe11d3451e513474796e08ad2678a65af157241694c656423919b1d13cf1ba3f7d3b274ed9a2b04eaa82a51e45a00efd848e7'
-            'bebb87f43b3920be8efde9aece9c4305323cd7d3a65a3b2441f0dbd0098c02a18ca89a5b08833eee70482cffae2c8e7b7237bb5a4d1076e3c30d273898e2bedb')
+            'ddf312c4af1ab31a54bcc037f0e78272193aa0dca66ed57066ec8c69d44f93559e9833a4c79becdd746557d9660474762f560dbe8ba21956432f09eb2d7c6ada')
 
 prepare() {
   export GOPATH="$srcdir/build"
@@ -37,8 +37,8 @@
 package() {
   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/c\ExecStart=/usr/bin/env v2ray.location.asset=/etc/v2ray /usr/bin/v2ray -config /etc/v2ray/config.json' "$pkgdir"/usr/lib/systemd/system/v2ray.service
+  install -Dm644 release/config/systemd/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service
+  sed -i '/ExecStart/i Environment=iv2ray_location_asset=/etc/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 02:47:36 UTC (rev 401449)
+++ v2ray.service	2018-11-04 05:28:48 UTC (rev 401450)
@@ -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