follow arch standards & use sha512sum

3 files changed, 14 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bf609999edb..8f516b079cef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = powerword-bin
 	pkgdesc = A Chinese-English dictionary tool.
 	pkgver = 1.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.iciba.com
-	install = powerword.install
 	arch = x86_64
 	license = unknown
 	depends = sdl2_mixer
@@ -13,9 +12,7 @@ pkgbase = powerword-bin
 	optdepends = ttf-ms-fonts: font support
 	provides = powerword
 	source = powerword-bin.deb::https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.kingsoft.powerword/com.kingsoft.powerword_1.2_amd64.deb
-	source = powerword.install
-	md5sums = 8712bbccce4ff5eebc7f04d2c250a581
-	md5sums = 2f1a949dad8635177f2fbb8fbb887cd8
+	sha512sums = c4d6146858fde3eafc3f087d1c284ceeeaf0747fa93db30c86cf33319f7c18e08757b4981f410fe6bb2bcc80bbedea5931e05668ae604fa4bc491401d5079fdd
 
 pkgname = powerword-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f443e4c8397..31cf7a616f2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='powerword-bin'
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A Chinese-English dictionary tool."
 arch=('x86_64')
 license=('unknown')
@@ -11,11 +11,8 @@ url="http://www.iciba.com"
 provides=("powerword")
 depends=('sdl2_mixer' 'qtwebkit' 'ffmpeg' 'qrencode')
 optdepends=('ttf-ms-fonts: font support')
-source=("${pkgname}.deb::https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.kingsoft.powerword/com.kingsoft.powerword_${pkgver}_amd64.deb"
-        "powerword.install")
-md5sums=('8712bbccce4ff5eebc7f04d2c250a581'
-         '2f1a949dad8635177f2fbb8fbb887cd8')
-install=powerword.install
+source=("${pkgname}.deb::https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.kingsoft.powerword/com.kingsoft.powerword_${pkgver}_amd64.deb")
+sha512sums=('c4d6146858fde3eafc3f087d1c284ceeeaf0747fa93db30c86cf33319f7c18e08757b4981f410fe6bb2bcc80bbedea5931e05668ae604fa4bc491401d5079fdd')
 
 package() {
     cd ${srcdir}
@@ -23,20 +20,17 @@ package() {
     
     mkdir -p "${pkgdir}"/usr/share/
     mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/entries/* "${pkgdir}"/usr/share/
-    sed -i 's|/opt/apps/com.kingsoft.powerword/entries/|/usr/share/|g' "${pkgdir}"/usr/share/applications/com.kingsoft.powerword.desktop
-    sed -i 's|/opt/apps/com.kingsoft.powerword/files/|/usr/bin/|g' "${pkgdir}"/usr/share/applications/com.kingsoft.powerword.desktop
+    sed -i 's|/opt/apps/com.kingsoft.powerword/entries|/usr/share|g' "${pkgdir}"/usr/share/applications/com.kingsoft.powerword.desktop
+    sed -i 's|/opt/apps/com.kingsoft.powerword/files/|/opt/powerword/|g' "${pkgdir}"/usr/share/applications/com.kingsoft.powerword.desktop
+    chmod -R 0755 "${pkgdir}"/usr/share/
     
-    mkdir -p "${pkgdir}"/usr/bin/
-    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/Powerword "${pkgdir}"/usr/bin/Powerword
-    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/mp3player "${pkgdir}"/usr/bin/mp3player
-    
-    # data should be moved to ~/.config/com.kingsoft.powerword/resources manually
-    mkdir -p "$pkgdir"/tmp/
-    chmod -R 0775 "${pkgdir}"/tmp/
-    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/resources "$pkgdir"/tmp
+    mkdir -p "${pkgdir}"/opt/powerword/
+    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/Powerword "${pkgdir}"/opt/powerword/Powerword
+    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/mp3player "${pkgdir}"/opt/powerword/mp3player
+    mv "${pkgdir}"/opt/apps/com.kingsoft.powerword/files/resources "${pkgdir}"/opt/powerword/resources
     
     # remove unused batch files.
-    find "$pkgdir"/tmp/resources -name "*.bat"  | xargs rm -f
+    find "${pkgdir}"/opt/powerword/resources -name "*.bat"  | xargs rm -f
     
-    rm -r "${pkgdir}"/opt
+    rm -r "${pkgdir}"/opt/apps
 } 
diff --git a/powerword.install b/powerword.install
deleted file mode 100644
index ae9540507b88..000000000000
--- a/powerword.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-    function byellow(){
-    echo -e "\033[33m\033[01m$1 \033[0m"
-    }
-    if [ "$LANG" = "zh_CN.UTF-8" ]; then
-        byellow "如果你以前没有手动将数据文件复制到用户目录，"
-        byellow "请使用以下代码复制数据，否则输入法无法正常运行。 \n"
-    else
-        byellow "If you didn't manually copy data files to your user home before,"
-        byellow "just do it by the following code, or it won't work. \n"
-    fi
-    byellow "mkdir -p ~/.config/com.kingsoft.powerword"
-    byellow "cp -r /tmp/resources ~/.config/com.kingsoft.powerword"
-    printf "\n"
-}
-pre_upgrade() {
-    rm -rf /opt/apps/com.kingsoft.powerword #for 1.2-2 only
-    post_install
-}
-