AUR

3 files changed, 35 insertions, 13 deletions

diff --git a/.INSTALL b/.INSTALL
index ef6c1ce35c7a..1edeb9630b94 100644
--- a/.INSTALL
+++ b/.INSTALL
@@ -5,11 +5,19 @@ post_install() {
     systemctl daemon-reload
     systemctl enable v2raya
     systemctl start v2raya
-    echo -e "\033[36m**************************************\033[0m"
-    echo -e "\033[36m*         Congratulations!           *\033[0m"
-    echo -e "\033[36m* HTTPS demo: https://v2raya.mzz.pub *\033[0m"
-    echo -e "\033[36m* HTTP  demo: http://v.mzz.pub       *\033[0m"
-    echo -e "\033[36m**************************************\033[0m"
+
+    ECHOLEN=$(echo -e|awk '{print length($0)}')
+    if [ ${ECHOLEN} = '0' ]
+    then
+        ECHO='echo -e'
+    else
+        ECHO='echo'
+    fi;
+    $ECHO "\033[36m**************************************\033[0m"
+    $ECHO "\033[36m*         Congratulations!           *\033[0m"
+    $ECHO "\033[36m* HTTPS demo: https://v2raya.mzz.pub *\033[0m"
+    $ECHO "\033[36m* HTTP  demo: http://v.mzz.pub       *\033[0m"
+    $ECHO "\033[36m**************************************\033[0m"
 
 }
 post_upgrade() {
@@ -18,11 +26,19 @@ post_upgrade() {
 
     systemctl daemon-reload
     systemctl restart v2raya
-    echo -e "\033[36m**************************************\033[0m"
-    echo -e "\033[36m*         Congratulations!           *\033[0m"
-    echo -e "\033[36m* HTTPS demo: https://v2raya.mzz.pub *\033[0m"
-    echo -e "\033[36m* HTTP  demo: http://v.mzz.pub       *\033[0m"
-    echo -e "\033[36m**************************************\033[0m"
+    
+    ECHOLEN=$(echo -e|awk '{print length($0)}')
+    if [ ${ECHOLEN} = '0' ]
+    then
+        ECHO='echo -e'
+    else
+        ECHO='echo'
+    fi;
+    $ECHO "\033[36m**************************************\033[0m"
+    $ECHO "\033[36m*         Congratulations!           *\033[0m"
+    $ECHO "\033[36m* HTTPS demo: https://v2raya.mzz.pub *\033[0m"
+    $ECHO "\033[36m* HTTP  demo: http://v.mzz.pub       *\033[0m"
+    $ECHO "\033[36m**************************************\033[0m"
 
 }
 
diff --git a/.SRCINFO b/.SRCINFO
index c48c42f44285..8e479358ecf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = v2raya
 	pkgdesc = 一个支持全局透明代理且兼容 SS、SSR 的 V2Ray Linux GUI Client
-	pkgver = 0.6.5.1
+	pkgver = 0.6.5.2
 	pkgrel = 1
 	url = https://github.com/mzz2017/V2RayA
 	install = .INSTALL
@@ -13,7 +13,7 @@ pkgbase = v2raya
 	makedepends = go>=2:1.11.3-1
 	depends = glibc
 	depends = v2ray
-	source = v2raya-0.6.5.1.tar.gz::https://github.com/mzz2017/V2RayA/archive/v0.6.5.1.tar.gz
+	source = v2raya-0.6.5.2.tar.gz::https://github.com/mzz2017/V2RayA/archive/v0.6.5.2.tar.gz
 	sha512sums = SKIP
 
 pkgname = v2raya
diff --git a/PKGBUILD b/PKGBUILD
index 24f0007b93ff..853cc77f27c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: mzz2017 <m@mzz.pub>
 
 pkgname=v2raya
-pkgver=0.6.5.1
+pkgver=0.6.5.2
 pkgrel=1
 install=.INSTALL
 pkgdesc="一个支持全局透明代理且兼容 SS、SSR 的 V2Ray Linux GUI Client"
@@ -22,6 +22,12 @@ build() {
 
 package() {
     cd "V2RayA-$pkgver"
+    
     install -Dm644 "install/v2raya.service" "$pkgdir/usr/lib/systemd/system/v2raya.service"
     install -Dm755 "service/v2raya" -t "$pkgdir/usr/bin/"
+    
+    ICON_SOURCE=gui/public/img/icons
+    ICON_TARGET=/usr/share/icons
+    sudo install -Dm644 "$ICON_SOURCE/android-chrome-512x512.png" "$ICON_TARGET/v2raya.png"
+    sudo install -Dm755 "install/v2raya.desktop" -t "$pkgdir/usr/share/applications/"
 }