fix typo:java soft link

3 files changed, 11 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 602bfac7b02c..5053dd02e0cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yozo-office
 	pkgdesc = 永中办公 2019 | Yozo Office 2019 - An M$ Office Compatible Office Suite
 	pkgver = 8.0.1331.101ZH.S1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.yozosoft.com/product-officelinux.html
 	arch = x86_64
 	license = custom
@@ -21,7 +21,6 @@ pkgname = yozo-office
 	optdepends = ttf-ms-fonts: Arial, Times, Courier etc.
 	optdepends = ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.
 	optdepends = yozo-office-fonts: UI Fonts
-	optdepends = yozo-office-2019-templates: Templates files
 
 pkgname = yozo-office-fonts
 	pkgdesc = 永中办公界面字体 | UI Fonts provided by Yozo Office 2019
diff --git a/PKGBUILD b/PKGBUILD
index 264f846c2de1..29f2c096c6ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=yozo-office
 pkgname=('yozo-office' 'yozo-office-fonts')
 pkgver=8.0.1331.101ZH.S1
-pkgrel=1
+pkgrel=2
 pkgdesc="永中办公 2019 | Yozo Office 2019 - An M$ Office Compatible Office Suite"
 url="https://www.yozosoft.com/product-officelinux.html"
 options=('!strip')
@@ -18,21 +18,14 @@ conflicts=('yozo-office-2019')
 source_x86_64=("http://www.yozosoft.com/portal-download/fileManager/PRODUCT/yozo-office_${pkgver}_amd64.deb")
 md5sums_x86_64=('cf22531071e607019c02a1a046f70e5c')
 
-
-prepare() {
-    cd "${srcdir}"
-    bsdtar -xpf data.tar.xz
-}
-
 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'
-    		'yozo-office-2019-templates: Templates files')
+    		    'ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.'
+                'yozo-office-fonts: UI Fonts')
     install=${pkgname}.install
     cd "${srcdir}"
-    mv etc opt usr "${pkgdir}"
+    tar -xJf data.tar.xz -C "${pkgdir}"
     chmod 755 $pkgdir/usr/lib
     chmod 755 $pkgdir/usr/lib64
     chmod 755 $pkgdir/usr
@@ -47,15 +40,12 @@ package_yozo-office() {
     rm -rf usr/share/mime
     rm -rf usr/share/applications/yozo-uninstall.desktop
     rm -rf opt/Yozosoft/Yozo_Office/Templates
-    #Translate pathname
-    #cd opt/Yozosoft/Yozo_Office/ScienceEditorImages
-    #find . -type f -exec iconv * -f gb18030 -t utf8 {} \;
     #Split fonts files
     cd "${srcdir}"
-    install -d usr/share/fonts/truetype
+    mkdir -p usr/share/fonts/truetype
     mv "${pkgdir}"/usr/share/fonts/truetype/yozo usr/share/fonts/truetype
     
-    #Replace Java bin
+    #Redirect Java bin
     rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
     ln -sf /usr/lib/jvm/default/bin "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
     cd $pkgdir/opt/Yozosoft/Yozo_Office/Jre/lib
@@ -64,13 +54,11 @@ package_yozo-office() {
             rm -rf $j
         fi
     done
-    #Verify that All World-Writable Directories Have Sticky Bits Set
-    find "${pkgdir}" -xdev -type d \( -perm -0002 -a ! -perm -1000 \) -print0 | xargs -0 chmod +t
     #Move VLC plugin lib
     mkdir -p "${pkgdir}"/usr/lib/Yozo_Office/
     mv "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/* "${pkgdir}"/usr/lib/Yozo_Office
     rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib
-    ln -sf "${pkgdir}"/usr/lib/Yozo_Office "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib
+    ln -sf /usr/lib/Yozo_Office "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib
     
     install -Dm644 "${pkgdir}"/opt/Yozosoft/Yozo_Office/thirdpartylicensereadme.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
     
@@ -82,6 +70,6 @@ package_yozo-office() {
 package_yozo-office-fonts() {
     pkgdesc="永中办公界面字体 | UI Fonts provided by Yozo Office 2019"
     cd "${srcdir}"
-    install -d "${pkgdir}"/usr/share/fonts/truetype
+    mkdir -p "${pkgdir}"/usr/share/fonts/truetype
     mv usr/share/fonts/truetype/yozo "${pkgdir}"/usr/share/fonts/truetype
 }
diff --git a/yozo-office.install b/yozo-office.install
index a49710bc231f..6e44ac5e1f38 100644
--- a/yozo-office.install
+++ b/yozo-office.install
@@ -1,8 +1,8 @@
 post_install() {
-  cd /usr/lib/jvm/java-8-openjdk/jre/lib
+  cd /usr/lib/jvm/default/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
+          ln -sf /usr/lib/jvm/default/lib/$i /opt/Yozosoft/Yozo_Office/Jre/lib/$i
       fi
   done
   echo "------------------- 温馨提示 --------------------"