fix errors

2 files changed, 19 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac55fc2ab4ba..824c81ba7518 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = easyconnect
 	pkgdesc = Support access to ssl vpn. With easyconect,you can secure and speed up connection to cooperate network at ease!
 	pkgver = 7.6.7.3
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.sangfor.com.cn
 	install = easyconnect.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b6edf51bec27..c8c287c4349e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: arthur_0 <maxc@stateoftheart.pw>
 # Contributor: attenuation <ouyangjun1999@gmail.com>
 pkgname=easyconnect
-_appname=EasyConnect
+_pkgname=EasyConnect
 pkgver=7.6.7.3
-pkgrel=4
+pkgrel=5
 _pangover=1.42.4
 pkgdesc="Support access to ssl vpn. With easyconect,you can secure and speed up connection to cooperate network at ease!"
 arch=('x86_64')
@@ -16,18 +16,29 @@ depends=('dbus' 'dbus-glib' 'libxrender' 'bash' 'nss' 'libxext' 'glibc' 'libxcur
     'libxcb' 'gcc-libs' 'libxfixes' 'zlib' 'nspr' 'alsa-lib' 'libthai' 'glib2' 'freetype2')
 makedepends=('gobject-introspection')
 install="${pkgname}.install"
-source=("${pkgname}-${pkgver}.deb::https://download.sangfor.com.cn/download/product/sslvpn/pkg/linux_767/${_appname}_x64_${pkgver//./_}.deb"
+source=("${pkgname}-${pkgver}.deb::https://download.sangfor.com.cn/download/product/sslvpn/pkg/linux_767/${_pkgname}_x64_${pkgver//./_}.deb"
     "pango-${_pangover}.tar.xz::https://download.gnome.org/sources/pango/${_pangover%.4}/pango-${_pangover}.tar.xz"
     "LICENSE")
 sha256sums=('ae623c6dc0354ff87afefbb770de5013bfd943051c9a653b93db708253b2f0d3'
             '1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d'
             'b4b0db5e577c1b565a7f065ce8f9a4f9622b673fbcffa27ccbaf68f061a67a68')
-package(){
-    bsdtar -xf "${srcdir}/data.tar.gz" -C "${pkgdir}"
+prepare() {
+    bsdtar -xf "${srcdir}/data.tar.gz"
     bsdtar -xf "${srcdir}/pango-${_pangover}.tar.xz"
+    sed "s|Exec=|Exec=env LD_LIBRARY_PATH=/usr/share/sangfor/${_pkgname}/oldlib/pango/usr/lib |g" \
+        -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
+}
+build() {
     cd "${srcdir}/pango-${_pangover}"
     ./configure --prefix=/usr
-    make -j4 && make DESTDIR="${pkgdir}/usr/share/sangfor/${_appname}/oldlib/pango" install
-    sed "s|Exec=|Exec=env LD_LIBRARY_PATH=/usr/share/sangfor/${_appname}/oldlib/pango/usr/lib |g" -i "${pkgdir}/usr/share/applications/${_appname}.desktop"
+    make -j4 && make DESTDIR="${srcdir}/oldlib/pango" install
+}
+package() {
+    install -Dm644 "${srcdir}/etc/init/EasyMonitor.conf" -t "${pkgdir}/etc/init"
+    install -Dm644 "${srcdir}/usr/lib/systemd/system/EasyMonitor.service" -t "${pkgdir}/usr/lib/systemd/system"
+    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/usr/share/pixmaps/${_pkgname}.png" -t "${pkgdir}/usr/share/pixmaps"
+    cp -r "${srcdir}/usr/share/sangfor" "${pkgdir}/usr/share"
+    cp -r "${srcdir}/oldlib" "${pkgdir}/usr/share/sangfor/${_pkgname}"
     install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file