Remove mime to fix some issues, and add some scripts from the deb package

3 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac49e103d6c1..c0dd522d5b5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = yozo-office
 	pkgdesc = Yozo Office - An M$ Office Compatible Office Suit
 	pkgver = 7.0.2439.101ZH.S1
-	pkgrel = 1
-	url = http://www.yozosoft.com/person/
+	pkgrel = 2
+	url = http://www.yozosoft.com/
 	install = yozo-office.install
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 56deae49e978..cee15a373fde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=yozo-office
 _pkgver=7.0.2439.101ZH.S1
 pkgver=7.0.2439.101ZH.S1
-pkgrel=1
+pkgrel=2
 pkgdesc="Yozo Office - An M$ Office Compatible Office Suit"
-url="http://www.yozosoft.com/person/"
+url="http://www.yozosoft.com/"
 depends=('libxtst' 'libxt')
 optdepends=('ttf-ms-fonts: Arial, Times, Courier etc.'
 			'ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.')
@@ -19,10 +19,8 @@ package() {
 cd "$srcdir"
 tar -xvf data.tar.xz
 mv usr etc opt "$pkgdir"
-
+rm -rf "${pkgdir}/usr/share/mime"
 targetP="${pkgdir}/opt/Yozosoft/Yozo_Office"
 unpackP="${targetP}/Jre/bin/unpack200"
 libP="${targetP}/Jre/lib"
-
-
 }
\ No newline at end of file
diff --git a/yozo-office.install b/yozo-office.install
index b044f035f9f6..d36207740623 100644
--- a/yozo-office.install
+++ b/yozo-office.install
@@ -1,11 +1,15 @@
 post_install() {
+  echo "handling file association, waiting a while..."
+  /opt/Yozosoft/Yozo_Office/Jre/bin/java -jar /opt/Yozosoft/Yozo_Office/Mimelnk/fileAssociate.jar -i
+  /opt/Yozosoft/Yozo_Office/Jre/bin/deployApplet -default -nogui
+  echo "After installation is complete. Please restart your computer."
+  post_upgrade
+}
+post_upgrade() {
   xdg-icon-resource forceupdate --theme hicolor &>/dev/null
   update-mime-database /usr/share/mime &>/dev/null
   update-desktop-database -q &>/dev/null
 }
-post_upgrade() {
-  post_install
-}
 post_remove() {
-  post_install
+  post_upgrade
 }