remove unused exe,tidy path

4 files changed, 42 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79fb01f292e2..d53ed46e3ade 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dingtalk-bin
 	pkgdesc = 钉钉
 	pkgver = 1.0.0.285
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gov.dingtalk.com
 	arch = x86_64
 	license = custom
@@ -10,13 +10,13 @@ pkgbase = dingtalk-bin
 	provides = dingtalk
 	conflicts = com.alibabainc.dingtalk
 	replaces = com.alibabainc.dingtalk
-	source = https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_1.0.0.285_amd64.deb
+	source = dingtalk_1.0.0.285-x86_64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_1.0.0.285_amd64.deb
 	source = service-terms-zh
 	source = com.alibabainc.dingtalk.desktop
 	source = dingtalk.sh
-	md5sums = c55d666652ad08c3a2bd0e10b469426f
-	md5sums = 55c7432e36da19b45102376dad9ebdf7
-	md5sums = e1b984a024700a9ef5f77a1018a41f8e
-	md5sums = 0e255cd61852162548db96e46f1dda00
+	sha512sums = 64de46104e438ea61c7148bfb88a22e4a40ce7c7f3854e1b469caa0989e0852f8bc2dce49e582ad8d08bdec66fa8be4a80902f748425f298ad1fab5d3a81bd64
+	sha512sums = b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64
+	sha512sums = c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f
+	sha512sums = 92216c292ebe74066a51552fce9b93aef3b9ca7d0e25e652852220d13999fc6ca2b7dd126836d375c13ed6bdd169073795f40ad1e0f2c63ea58db40a73deb4c2
 
 pkgname = dingtalk-bin
diff --git a/PKGBUILD b/PKGBUILD
index af2d5cdc5be2..832b613b3f13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor: Bruce Zhang <zttt183525594@gmail.com>
 
 pkgname=dingtalk-bin
-_pkgname=com.alibabainc.dingtalk
+_pkgname=dingtalk
+_pkgname2=com.alibabainc.dingtalk
 pkgver=1.0.0.285
-pkgrel=1
+pkgrel=2
 pkgdesc="钉钉"
 arch=("x86_64")
 url="https://gov.dingtalk.com"
@@ -15,17 +16,18 @@ provides=('com.alibabainc.dingtalk' 'dingtalk')
 conflicts=('com.alibabainc.dingtalk')
 replaces=('com.alibabainc.dingtalk')
 # https://tms.dingtalk.com/markets/dingtalk/service-terms-zh md5 will change per download
-source=("https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/${_pkgname}_${pkgver}_amd64.deb"
+source=("${_pkgname}_${pkgver}-${arch}.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/${_pkgname2}_${pkgver}_amd64.deb"
         "service-terms-zh"
-        "${_pkgname}.desktop"
+        "${_pkgname2}.desktop"
         "dingtalk.sh")
 
+
 # DebSource & pkgvere can be get here: https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Update/other/linux_dingtalk_update.json
 
-md5sums=('c55d666652ad08c3a2bd0e10b469426f'
-         '55c7432e36da19b45102376dad9ebdf7'
-         'e1b984a024700a9ef5f77a1018a41f8e'
-         '0e255cd61852162548db96e46f1dda00')
+sha512sums=('64de46104e438ea61c7148bfb88a22e4a40ce7c7f3854e1b469caa0989e0852f8bc2dce49e582ad8d08bdec66fa8be4a80902f748425f298ad1fab5d3a81bd64'
+            'b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64'
+            'c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f'
+            '92216c292ebe74066a51552fce9b93aef3b9ca7d0e25e652852220d13999fc6ca2b7dd126836d375c13ed6bdd169073795f40ad1e0f2c63ea58db40a73deb4c2')
 
 prepare(){
     cd ${srcdir}
@@ -35,17 +37,36 @@ prepare(){
 package(){
     cd ${srcdir}
 
-    mkdir -p ${pkgdir}/opt/apps/${_pkgname}/files
-    mv opt/apps/${_pkgname}/files/* ${pkgdir}/opt/apps/${_pkgname}/files
+    mkdir -p ${pkgdir}/opt/${_pkgname}/release
+    mkdir -p ${pkgdir}/usr/share/doc/
+    mv opt/apps/${_pkgname2}/files/*-Release.*/* ${pkgdir}/opt/${_pkgname}/release
+    mv opt/apps/${_pkgname2}/files/version ${pkgdir}/opt/${_pkgname}
+    mv opt/apps/${_pkgname2}/files/doc/${_pkgname2} ${pkgdir}/usr/share/doc/${_pkgname}
 
     # binary wrapper
     install -Dm755 ${srcdir}/dingtalk.sh ${pkgdir}/usr/bin/dingtalk
 
     # desktop enrty
-    install -Dm644 ${_pkgname}.desktop -t ${pkgdir}/usr/share/applications/
+    install -Dm644 ${_pkgname2}.desktop -t ${pkgdir}/usr/share/applications/
+    
+    # icons 
+    install -Dm644 opt/apps/${_pkgname2}/files/logo.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg
 
     # license
-    install -Dm644 service-terms-zh ${pkgdir}/usr/share/licenses/${pkgname}/service-terms-zh
+    install -Dm644 service-terms-zh ${pkgdir}/usr/share/licenses/${_pkgname}/service-terms-zh.html
 
-    rm ${pkgdir}/opt/apps/${_pkgname}/files/*/libm.so.6
+#     ## libraries
+# 
+#     cd ${pkgdir}/opt/${_pkgname}/release
+#     mkdir ${pkgdir}/opt/${_pkgname}/tmplib
+#     mv {dingtalk*,libcef.so,libgraysdk.so,libahencrypt.so,libpangox-1.0.so.0,libgtkglext-x11-1.0.so.0,libgdkglext-x11-1.0.so.0,libutforpc.so} ${pkgdir}/opt/${_pkgname}/tmplib
+#     
+#     
+#     ## remove unused files
+#     rm  -rf ${pkgdir}/opt/${_pkgname}/release/{libQt*,libm.so.6,imageformats,platforminputcontexts,platforms}
+#     rm  -rf ${pkgdir}/opt/${_pkgname}/release/lib*
+#     mv ${pkgdir}/opt/${_pkgname}/tmplib/* ${pkgdir}/opt/${_pkgname}/release
+#     rmdir ${pkgdir}/opt/${_pkgname}/tmplib 
+    # dingtalk_updater
+    rm -rf ${pkgdir}/opt/${_pkgname}/release/{libm.so.6,Resources/{i18n/tool/*.exe,qss/mac}}
 }
diff --git a/com.alibabainc.dingtalk.desktop b/com.alibabainc.dingtalk.desktop
index 21446e5e0ac3..18f8063926e1 100644
--- a/com.alibabainc.dingtalk.desktop
+++ b/com.alibabainc.dingtalk.desktop
@@ -3,7 +3,7 @@ Categories=Chat;Network;
 Comment=DingTalk
 Exec=dingtalk %u
 GenericName=dingtalk
-Icon=/opt/apps/com.alibabainc.dingtalk/files/logo.svg
+Icon=dingtalk
 Keywords=dingtalk;
 MimeType=x-scheme-handler/dingtalk;
 Name=DingTalk
diff --git a/dingtalk.sh b/dingtalk.sh
index bd69acb3e9ca..58adc565dc41 100644
--- a/dingtalk.sh
+++ b/dingtalk.sh
@@ -1,3 +1,3 @@
 #!/bin/bash -e
-cd /opt/apps/com.alibabainc.dingtalk/files/*-Release*/
+cd /opt/dingtalk/release
 LD_PRELOAD="/usr/lib/libnss3.so" ./com.alibabainc.dingtalk