follow arch standards & link files automatically

3 files changed, 44 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 725d284fbe77..63edd0323d0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fcitx-baidupinyin
 	pkgdesc = Fcitx wrapper for Baidu Pinyin IM engine
 	pkgver = 1.0.1.0
-	pkgrel = 8
+	pkgrel = 9
 	url = https://srfsh.baidu.com/site/guanwang_linux/index.html
 	install = fcitx-baidupinyin.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 9e19e879cdc3..edf70fb9ac2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fkxxyz <fkxxyz@163.com>
 pkgname=fcitx-baidupinyin
 pkgver=1.0.1.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Fcitx wrapper for Baidu Pinyin IM engine"
 arch=("x86_64")
 url="https://srfsh.baidu.com/site/guanwang_linux/index.html"
@@ -34,21 +34,27 @@ package(){
     
     mkdir -p "$pkgdir"/usr/lib/fcitx/
     mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/lib/fcitx*  "$pkgdir"/usr/lib/fcitx/
-    cp -r "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/* "$pkgdir"/usr/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/lib/*  "$pkgdir"/usr/lib/
+    
+    mkdir -p "$pkgdir"/usr/bin/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/baidu-qimpanel "$pkgdir"/usr/bin/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/bd-qimpanel.watchdog.sh "$pkgdir"/usr/bin/
     sed -i  's|/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/baidu-qimpanel|/usr/bin/baidu-qimpanel|g' "$pkgdir"/usr/bin/bd-qimpanel.watchdog.sh
     
-    # change the /opt/apps/... directory string in baidu-qimpanel to /usr/bin, add \x0 to make the strings be of the same length
-    sed -i 's|/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/BDIMSettings|/usr/bin/BDIMSettings\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g' "$pkgdir"/usr/bin/baidu-qimpanel
+    mkdir -p "$pkgdir"/opt/fcitx-baidupinyin/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/BDIMSettings "$pkgdir"/opt/fcitx-baidupinyin/
+    
     
-    # data should be moved to ~/.config/BaiduPY.user manually
-    mkdir -p "$pkgdir"/tmp/
-    mv "$pkgdir"/usr/share/data "$pkgdir"/tmp
+    # change the /opt/apps/... directory string in baidu-qimpanel to /opt/fcitx-baidupinyin/, add \x0 to make the strings be of the same length
+    sed -i 's|/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/BDIMSettings|/opt/fcitx-baidupinyin/BDIMSettings\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g' "$pkgdir"/usr/bin/baidu-qimpanel
+    
+    # move needed resources
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/share/data "$pkgdir"/opt/fcitx-baidupinyin/
     
-    # install license
     install -Dm644 "${srcdir}/LICENSE"  "${pkgdir}/usr/share/licenses/fcitx-baidupinyin/LICENSE"
+    
     # clean up unused files
-    rm -rf "$pkgdir"/opt
+    rm -rf "$pkgdir"/opt/apps
     rm -rf "$pkgdir"/usr/lib/*-linux-gnu
     rm -r "$pkgdir"/fcitx-baidupinyin.deb
-    rm  "$pkgdir"/usr/bin/BDIMWizard
 }
diff --git a/fcitx-baidupinyin.install b/fcitx-baidupinyin.install
index e1207759ff94..f875dde19c86 100644
--- a/fcitx-baidupinyin.install
+++ b/fcitx-baidupinyin.install
@@ -1,18 +1,31 @@
 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/BaiduPY.user/data"
-    byellow "cp -r /tmp/data ~/.config/BaiduPY.user"
-    printf "\n"
+    for dir in /home/*
+    do
+        if test -d $dir
+        then
+            if [ ! -d "$dir/.config/BaiduPY.user" ]; then
+                mkdir $dir/.config/BaiduPY.user
+            fi
+            if [ -d "$dir/.config/BaiduPY.user/data" ]; then
+                rm -rf $dir/.config/BaiduPY.user/data
+            fi
+            ln -s  /opt/fcitx-baidupinyin/data $dir/.config/BaiduPY.user/
+        fi
+    done
 }
-pre_upgrade() {
+
+post_upgrade() {
     post_install
 }
+
+post_remove() {
+    for dir in /home/*
+    do
+        if test -d $dir
+        then
+            if [ -d "$dir/.config/BaiduPY.user/" ]; then
+                rm -rf $dir/.config/BaiduPY.user/data
+            fi
+        fi
+    done
+}