modify to arch standards

4 files changed, 62 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9f505076191..3bf609999edb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,21 @@
 pkgbase = powerword-bin
 	pkgdesc = A Chinese-English dictionary tool.
 	pkgver = 1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.iciba.com
-	install = powerword-bin.install
+	install = powerword.install
 	arch = x86_64
-	groups = 
-	license = custom
-	depends = nss
-	depends = openssl-1.0
-	depends = qt4
-	depends = libbsd
-	depends = sdl2
-	depends = tar
+	license = unknown
+	depends = sdl2_mixer
+	depends = qtwebkit
+	depends = ffmpeg
+	depends = qrencode
 	optdepends = ttf-ms-fonts: font support
 	provides = powerword
-	provides = com.kingsoft.powerword
-	source = https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.kingsoft.powerword/com.kingsoft.powerword_1.2_amd64.deb
-	source = powerword-bin.install
+	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 = 7d8361adfa0c369ee5bc7ae5403d7a4c
+	md5sums = 2f1a949dad8635177f2fbb8fbb887cd8
 
 pkgname = powerword-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index ef255817b65f..6f443e4c8397 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,42 @@
 # Maintainer: Sam L. Yes <manjaroyes123@outlook.com>
+# Maintainer: Sukanka <su975853527 [AT] gmail.com>
 
-pkgname=('powerword-bin')
-_pkgname='powerword'
-_dpkgname='com.kingsoft.powerword'
+pkgname='powerword-bin'
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Chinese-English dictionary tool."
 arch=('x86_64')
+license=('unknown')
 url="http://www.iciba.com"
-license=('custom')
-groups=('')
-provides=(${_pkgname} ${_dpkgname})
-depends=('nss' 'openssl-1.0' 'qt4' 'libbsd' 'sdl2' 'tar')
-makedepends=()
+provides=("powerword")
+depends=('sdl2_mixer' 'qtwebkit' 'ffmpeg' 'qrencode')
 optdepends=('ttf-ms-fonts: font support')
-source=("https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/${_dpkgname}/${_dpkgname}_${pkgver}_amd64.deb"
-        "${pkgname}.install")
+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'
-         '7d8361adfa0c369ee5bc7ae5403d7a4c')
-install="${pkgname}.install"
-
-prepare() {
-    tar -xzvf ${srcdir}/control.tar.gz -C ${srcdir}
-    #tar xf ${srcdir}/data.tar.xz -C ${srcdir}
-}
+         '2f1a949dad8635177f2fbb8fbb887cd8')
+install=powerword.install
 
 package() {
-    install -d ${pkgdir}/opt/${_pkgname}
-	install -m644 ${srcdir}/data.tar.xz ${pkgdir}/opt/${_pkgname}
-    #install -d ${pkgdir}/usr/share/applications
-    #install -Dm755 ${pkgdir}/opt/apps/${_dpkgname}/entries/applications/${_dpkgname}.desktop ${pkgdir}/usr/share/applications
-    install -d ${pkgdir}/usr/share/licenses/${pkgname}
-    install -m644 ${srcdir}/copyright ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
+    cd ${srcdir}
+    tar -xJvf data.tar.xz -C "${pkgdir}"
+    
+    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
+    
+    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
+    
+    # remove unused batch files.
+    find "$pkgdir"/tmp/resources -name "*.bat"  | xargs rm -f
+    
+    rm -r "${pkgdir}"/opt
+} 
diff --git a/powerword-bin.install b/powerword-bin.install
deleted file mode 100644
index e7a317183b46..000000000000
--- a/powerword-bin.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    tar xf /opt/powerword/data.tar.xz -C /
-    cp /opt/apps/com.kingsoft.powerword/entries/applications/com.kingsoft.powerword.desktop /usr/share/applications
-}
-
-pre_remove() {
-    rm /usr/share/applications/com.kingsoft.powerword.desktop
-    rm -rf /opt/apps/com.kingsoft.powerword
-}
-
-pre_upgrade() {
-    pre_remove
-}
-
-post_upgrade() {
-    post_install
-}
\ No newline at end of file
diff --git a/powerword.install b/powerword.install
new file mode 100644
index 000000000000..ae9540507b88
--- /dev/null
+++ b/powerword.install
@@ -0,0 +1,20 @@
+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
+}
+