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

[Felix Yan]

    Date: Wednesday, November 20, 2019 @ 07:33:19
  Author: felixonmars
Revision: 530694

upgpkg: v2ray 4.21.3-2

move files to /usr/lib/v2ray

Modified:
  v2ray/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-20 07:33:13 UTC (rev 530693)
+++ PKGBUILD	2019-11-20 07:33:19 UTC (rev 530694)
@@ -3,7 +3,7 @@
 
 pkgname=v2ray
 pkgver=4.21.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
 url="https://github.com/v2ray/v2ray-core"
@@ -51,12 +51,14 @@
   cd "$srcdir"/build/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 -e '/ExecStart/i Environment=V2RAY_LOCATION_ASSET=/etc/v2ray' \
-         -e 's|/usr/bin/v2ray/v2ray|/usr/bin/v2ray|' \
+  sed -i -e 's|/usr/bin/v2ray/v2ray|/usr/lib/v2ray/v2ray|' \
          "$pkgdir"/usr/lib/systemd/system/v2ray.service
   install -Dm644 release/config/*.json -t "$pkgdir"/etc/v2ray/
-  install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/bin/
-  install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/bin/
+  install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/lib/v2ray/
+  install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/lib/v2ray/
+  install -dm755 "$pkgdir"/usr/bin
+  ln -s ../lib/v2ray/v2ray "$pkgdir"/usr/bin/v2ray
+  ln -s ../lib/v2ray/v2ctl "$pkgdir"/usr/bin/v2ctl
 
   install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray at .service
 }