fix errors

2 files changed, 19 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16c59756b032..6af697d1b192 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = shadowsocks-electron-bin
 	pkgdesc = Shadowsocks GUI application made for Ubuntu/Mac/Win users and powered by Electron.
 	pkgver = 1.2.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/nojsja/shadowsocks-electron
 	arch = x86_64
 	license = GPL3
@@ -30,9 +30,8 @@ pkgbase = shadowsocks-electron-bin
 	depends = nss
 	depends = at-spi2-core
 	depends = libxfixes
-	provides = shadowsocks-electron
+	provides = shadowsocks-electron=1.2.3
 	conflicts = shadowsocks-electron
-	conflicts = shadowsocks
 	source = shadowsocks-electron-1.2.3.deb::https://github.com/nojsja/shadowsocks-electron/releases/download/v1.2.3/shadowsocks-electron_1.2.3_amd64.deb
 	sha256sums = f66c31e67b046c156a841219446f89c571daebc22458b456451c59f400be1c36
 
diff --git a/PKGBUILD b/PKGBUILD
index 60b1fc431952..79f063b4ab5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,30 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname="shadowsocks-electron-bin"
+pkgname=shadowsocks-electron-bin
+_pkgname="Shadowsocks Electron"
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Shadowsocks GUI application made for Ubuntu/Mac/Win users and powered by Electron."
 arch=('x86_64')
 url="https://github.com/nojsja/shadowsocks-electron"
 license=('GPL3')
-provides=("${pkgname%-bin}")
-conflicts=("${pkgname%-bin}" "${pkgname%-electron-bin}")
+provides=("${pkgname%-bin}=${pkgver}")
+conflicts=("${pkgname%-bin}")
 depends=('libxkbcommon' 'gcc-libs' 'libxrandr' 'expat' 'libxdamage' 'mesa' 'libxext' 'gtk3' 'nspr' 'dbus' 'libxcb' \
     'hicolor-icon-theme' 'libx11' 'libdrm' 'cairo' 'glibc' 'libcups' 'glib2' 'alsa-lib' 'gdk-pixbuf2' 'libxcomposite' \
     'pango' 'nss' 'at-spi2-core' 'libxfixes')
 source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/shadowsocks-electron_${pkgver}_amd64.deb")
 sha256sums=('f66c31e67b046c156a841219446f89c571daebc22458b456451c59f400be1c36')
-
+prepare() {
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\" %U|${pkgname%-bin} --no-sandbox %U|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+}
 package() {
-    bsdtar -xf "${srcdir}/data.tar.xz" -C "${pkgdir}"
+    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-bin}",usr/bin}
+    cp -r "${srcdir}/opt/${_pkgname}/"* "${pkgdir}/opt/${pkgname%-bin}"
+    ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    for _icons in 16x16 32x32 48x48 64x64 128x128 256x256;do
+        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+            -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
+    done
 }
\ No newline at end of file