update PKGBUILD

2 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 917c24b2e5bb..e438c1f70416 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = lceda-pro
 	pkgdesc = 免费、专业、强大的国产PCB设计工具
 	pkgver = 1.9.20
-	pkgrel = 2
+	pkgrel = 3
 	url = https://pro.lceda.cn/
 	install = lceda-pro.install
 	arch = x86_64
 	arch = aarch64
 	license = custom
 	license = Commercial
-	makedepends = libarchive
 	depends = gtk3
 	depends = nss
 	depends = alsa-lib
+	depends = electron
+	depends = libappindicator-gtk3
+	depends = libnotify
 	provides = lceda-pro
 	conflicts = lceda-pro
 	replaces = lceda-pro-bin
diff --git a/PKGBUILD b/PKGBUILD
index 47851bff32ad..0d2e2b35b2c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=lceda-pro
 pkgname=lceda-pro
 pkgver=1.9.20
-pkgrel=2
+pkgrel=3
 pkgdesc="免费、专业、强大的国产PCB设计工具"
 arch=('x86_64' 'aarch64')
 url="https://pro.lceda.cn/"
@@ -12,8 +12,8 @@ license=('custom' 'Commercial')
 provides=(${pkgname})
 conflicts=(${pkgname})
 replaces=(lceda-pro-bin)
-depends=(gtk3 nss alsa-lib)
-makedepends=(libarchive)
+depends=(gtk3 nss alsa-lib electron libappindicator-gtk3 libnotify)
+makedepends=()
 backup=()
 options=()
 install=${pkgname}.install
@@ -26,45 +26,42 @@ sha256sums=('9b53bc19a98498c86019cc32a3ade6ad0ee4b12ba30686feb93132a5f0da52f5'
 sha256sums_x86_64=('a9f0191d2aafe6a995f96c9d0f7e295f155ee107fccee677d8f804303434c54f')
 sha256sums_aarch64=('a9f0191d2aafe6a995f96c9d0f7e295f155ee107fccee677d8f804303434c54f')
 
-# noextract=(${pkgname}-${pkgver}.zip)
+noextract=()
 
 package() {
     export LC_CTYPE="zh_CN.UTF-8"
-    install -dm0755 "${pkgdir}/opt/${pkgname}/"
 
-    #bsdtar xf "${srcdir}/${pkgname}-linux-x64.zip" --strip-components=1 -C  "${pkgdir}/opt/${pkgname}"
-    #bsdtar xf "${srcdir}/${pkgname}-linux-x64.zip" -C  "${pkgdir}/opt/${pkgname}"
-    mv ${srcdir}/${pkgname}-linux-x64/* ${pkgdir}/opt/${pkgname}
+    # electron file
+    install -dm0755 "${pkgdir}/usr/share/${pkgname}/"
+    cd ${srcdir}/${pkgname}-linux-x64/
+    cp -r resources ${pkgdir}/usr/share/${pkgname}
+    cp -r locales ${pkgdir}/usr/share/${pkgname}
 
     # icon
     local _icon
     for _icon in 16 32 64 128 256 512; do
-        install -Dm0644 ${pkgdir}/opt/${pkgname}/icon/icon_${_icon}x${_icon}.png \
+        install -Dm0644 icon/icon_${_icon}x${_icon}.png \
                         ${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgname}.png
     done
-    install -Dm644 ${pkgdir}/opt/${pkgname}/icon/icon_512x512@2x.png \
+    install -Dm644 icon/icon_512x512@2x.png \
                    ${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png
-    rm -rf ${pkgdir}/opt/${pkgname}/icon
 
     # desktop entry
-    install -Dm0644 ${pkgdir}/opt/${pkgname}/LCEDA-PRO.dkt \
+    install -Dm0644 LCEDA-PRO.dkt \
                     ${pkgdir}/usr/share/applications/${pkgname}.desktop
 
     sed -i 's|/opt/lceda-pro/icon/icon_128x128.png|lceda-pro|g' \
         ${pkgdir}/usr/share/applications/${pkgname}.desktop
     sed -i 's|/opt/lceda-pro/||g' \
         ${pkgdir}/usr/share/applications/${pkgname}.desktop
-    rm -rf ${pkgdir}/opt/${pkgname}/LCEDA-PRO.dkt
 
-    # soft link
-    find "${pkgdir}/opt/${pkgname}" -type f -exec chmod 644 "{}" \;
-    find "${pkgdir}/opt/${pkgname}" -type d -exec chmod 755 "{}" \;
-
-    install -dm0755 ${pkgdir}/usr/bin
-    ln -s /opt/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-    chmod 0755 ${pkgdir}/opt/${pkgname}/${pkgname}
+    # lceda-pro file
+    install -Dm0755 /dev/stdin ${pkgdir}/usr/bin/${pkgname} << EOF
+#!/bin/sh
 
+exec electron /usr/share/lceda-pro/resources/app/ "$@"
+EOF
     # LICENSE
-    install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    install -Dm0644 "${pkgdir}/opt/${pkgname}/嘉立创EDA分发许可协议.txt" ${pkgdir}/usr/share/licenses/${pkgname}/LCEDA_DLA.txt
+    install -Dm0644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    install -Dm0644 "嘉立创EDA分发许可协议.txt" ${pkgdir}/usr/share/licenses/${pkgname}/LCEDA_DLA.txt
 }