Split the built-in templates and dump soft link to Java bin

2 files changed, 138 insertions, 47 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ec10b1eb1e7b..b0ec085e6154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,57 +5,59 @@
 # Contributor: heavysink <unknow>
 
 pkgbase=yozo-office
-pkgname=('yozo-office' 'yozo-office-fonts')
+pkgname=('yozo-office' 'yozo-office-fonts' 'yozo-office-templates')
 pkgver=8.0.1331.101ZH.S1
-pkgrel=2
+pkgrel=3
 pkgdesc="永中办公 2019 | Yozo Office 2019 - An M$ Office Compatible Office Suite"
 url="https://www.yozosoft.com/product-officelinux.html"
 options=('!strip')
-license=("custom")
+license=("custom: yozo")
 arch=('x86_64')
-source_x86_64=("https://dl.yozosoft.com/portal-download/fileManager/PRODUCT/yozo-office_${pkgver}_amd64.deb")
-sha256sums_x86_64=('0896ca9d4b7163e769ba0be0da0862ed4322dabb18909a3309822832d0047d8f')
+source=("https://dl.yozosoft.com/yozo/project/file/20210415_094030_900850/yozo-office_8.0.1331.101ZH.S1_amd64.deb")
+# "https://dl.yozosoft.com/portal-download/fileManager/PRODUCT/yozo-office_${pkgver}_amd64.deb"
+sha256sums=('0896ca9d4b7163e769ba0be0da0862ed4322dabb18909a3309822832d0047d8f')
 
 prepare() {
-    cd "${srcdir}"
-    tar -xJf data.tar.xz # -C "${pkgdir}"
+    mkdir -p "${srcdir}"/temp
+    bsdtar --acls --xattrs -xpf data.tar.xz -C "${srcdir}"/temp
+
     # Premission fix
     find "${srcdir}" -type d -exec chmod 755 {} +
     
     # Remove unnecessary files
-    cd "${srcdir}"
+    cd "${srcdir}"/temp
     rm -rf etc/xdg
     rm -rf etc/skel
     rm -rf opt/Yozosoft/Yozo_Office/Upgrade
     rm -rf opt/Yozosoft/Yozo_Office/uninstall
     rm -rf usr/lib64
-    rm -rf usr/share/mime
     rm -rf usr/share/applications/yozo-uninstall.desktop
-    rm -rf opt/Yozosoft/Yozo_Office/Templates
 }
 package_yozo-office() {
-    depends=('java-runtime=8' 'libxt' 'libxmu' 'gtk2' 'libglvnd')
-    optdepends=('ttf-ms-fonts: Arial, Times, Courier etc.'
-    		    'ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.'
-                'yozo-office-fonts: UI Fonts')
-    install=${pkgname}.install
+    depends=('glibc>=2.3' 'libx11' 'libxext' 'libxi' 'libxt'
+             'libxtst' 'libxmu' 'libxau' 'libcups' 'libxcb')
+    optdepends=('yozo-office-fonts: UI Fonts'
+                'yozo-office-templates: Built-in Document Templates')
+    # install=${pkgname}.install
     
-    # Move to pkgdir
-    cd "${srcdir}"
+    # Copy to pkgdir
+    cd "${srcdir}"/temp
     cp -r usr opt etc "${pkgdir}"
     
-    # Separate font files
+    # Separate font files and built-in templates
     rm -rf "${pkgdir}"/usr/share/fonts
+    rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Templates
     
     # Redirect Java binary
-    rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
-    ln -sf /usr/lib/jvm/java-8-openjdk/jre/bin "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
-    cd $pkgdir/opt/Yozosoft/Yozo_Office/Jre/lib
-    for j in *; do
-        if [ "$j" != "ext" ]; then
-            rm -rf $j
-        fi
-    done
+    # rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
+    # ln -sf /usr/lib/jvm/java-8-openjdk/jre/bin "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
+    # cd $pkgdir/opt/Yozosoft/Yozo_Office/Jre/lib
+    # for j in *; do
+    #    if [ "$j" != "ext" ]; then
+    #        rm -rf $j
+    #    fi
+    # done
+
     # Redirect VLC lib
     #mkdir -p "${pkgdir}"/usr/lib/Yozo_Office/
     #mv "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/* "${pkgdir}"/usr/lib/Yozo_Office
@@ -70,8 +72,15 @@ package_yozo-office() {
 }
 
 package_yozo-office-fonts() {
-    pkgdesc="永中办公界面字体 | UI Fonts provided by Yozo Office 2019"
-    cd "${srcdir}"
+    pkgdesc="永中办公界面字体 | UI Fonts for Yozo Office 2019"
+    cd "${srcdir}"/temp
     mkdir -p "${pkgdir}"/usr/share/fonts/truetype
-    mv usr/share/fonts/truetype/yozo "${pkgdir}"/usr/share/fonts/truetype
+    cp -r usr/share/fonts/truetype/yozo "${pkgdir}"/usr/share/fonts/truetype
+}
+
+package_yozo-office-templates() {
+    pkgdesc="永中办公内置模板 | Yozo Office 2019 Built-in Document Templates"
+    cd "${srcdir}"/temp
+    mkdir -p "${pkgdir}"/opt/Yozosoft/Yozo_Office
+    cp -r opt/Yozosoft/Yozo_Office/Templates "${pkgdir}"/opt/Yozosoft/Yozo_Office
 }
diff --git a/yozo-office.install b/yozo-office.install
index a49710bc231f..fa2b1af257af 100644
--- a/yozo-office.install
+++ b/yozo-office.install
@@ -1,23 +1,105 @@
+pre_install() {
+    echo "$1"
+    echo "$0"
+    echo "$2"
+    echo "$3"
+
+    if [ "$1" = "install" ]; then 
+        if ! pacman -Qs yozo-office | grep -qi 'local'; then
+            if [ -f /etc/Yozosoft/Yozo_Office/installinfo.cfg ]; then
+                echo "Yozo Office is exist. Please uninstall Yozo Office, then install this office."
+                exit 1
+            fi
+            if [ -f /etc/Evermore/EIOffice/installinfo.cfg ]; then
+                echo "EIOffice is exist. Please uninstall EIOffice, then install this office."
+                exit 1
+            fi
+        fi
+    fi
+
+    if [ "$1" = "upgrade" ]; then
+        if [ -f /opt/Yozosoft/Yozo_Office/System/doExit ]; then
+            /opt/Yozosoft/Yozo_Office/System/doExit -check
+            if [ $? -ne 0 ]; then
+                echo "Yozo Office is running. Please stop Yozo Office, then upgrade."
+                exit 1
+            fi
+         fi
+    fi
+
+    exit 0
+
+}
 post_install() {
-  cd /usr/lib/jvm/java-8-openjdk/jre/lib
-  for i in *; do
-      if [ "$i" != "ext" ]; then
-          ln -sf /usr/lib/jvm/java-8-openjdk/jre/lib/$i /opt/Yozosoft/Yozo_Office/Jre/lib/$i
-      fi
-  done
-  echo "------------------- 温馨提示 --------------------"
-  echo "如果您刚才看见大量的 can't translate pathname ~"
-  echo "to UTF-8 报告，不用担心，这不影响安装后软件正常使用。"
-  echo "这是由于原包里的中文文件/目录名未采用标准字符，编码无法"
-  echo "正常转换所致。"
-  echo "祝您使用愉快 ～"
-  post_upgrade
+  # cd /usr/lib/jvm/java-8-openjdk/jre/lib
+  # for i in *; do
+  #    if [ "$i" != "ext" ]; then
+  #        ln -sf /usr/lib/jvm/java-8-openjdk/jre/lib/$i /opt/Yozosoft/Yozo_Office/Jre/lib/$i
+  #    fi
+  #done
+  # post_upgrade
+    echo "$0"
+    echo "$1"
+    echo "$2"
+    echo "$3"
+    target=/opt/Yozosoft/Yozo_Office
+    if [ "$1" = "configure" ]; then
+        if [ -z "$2" ]; then
+            echo "Configuring system. Please wait a while."
+            $target/Jre/bin/java -jar $target/System/configure.jar -i
+        fi
+        $target/Jre/bin/deployApplet -default -nogui
+        echo "Congratulations! Installation is complete. Please restart your computer."
+    fi
+    exit 0
 }
 post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-  update-mime-database /usr/share/mime &>/dev/null
-  update-desktop-database -q &>/dev/null
+    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-mime-database /usr/share/mime &>/dev/null
+    update-desktop-database -q &>/dev/null
 }
-post_remove() {
-  post_upgrade
+pre_remove() {
+    echo "$1"
+    echo "$2"
+    echo "$3"
+    echo "$0"
+    target=/opt/Yozosoft/Yozo_Office
+    if [ "$1" = "remove" ]; then
+        $target/System/doExit -check
+        if [ $? -ne 0 ]; then
+            echo "Yozo Office is running. Please stop Yozo Office, then uninstall."
+            exit 1
+        fi
+        echo "Configuring system. Please wait a while."
+
+        if [ -f $target/System/unpatch.ini ]; then
+            while read line
+            do
+                truncate=${line#*=}
+                if [ -f $truncate ]; then
+                    rm -f $truncate
+                fi
+            done < $target/System/unpatch.ini
+        fi
+
+        $target/Jre/bin/java -jar $target/System/configure.jar -u
+        rm /etc/skel/.java/deployment/deployment.properties
+
+        rm -rf $HOME/.Yozo_Office/UserConfig
+        if [ -f $target/patcheio.log ]; then
+            rm -f $target/patcheio.log
+        fi
+        if [ -d $HOME/.Yozo_Office/CustomizedSEImages ]; then
+            rm -rf $HOME/.Yozo_Office/CustomizedSEImages
+        fi
+        #rm -f $target/ScienceEditorImages/logicalData $target/ScienceEditorImages/logicalData_0 $target/#ScienceEditorImages/logicalData_1 $target/ScienceEditorImages/logicalData_2
+        #if [ -d $target/ScienceEditorImages ]; then 
+        #    rm -rf $target/ScienceEditorImages &>/dev/null
+        #fi
+        rm -rf $target/Config/Key.store
+        rm -rf $target/System
+        rm -rf $target/Upgrade/Patch
+        rm -rf $target/Jre/lib
+    fi
+    exit 0
 }