2013.6.1.0418.131ZH.CL01-3

3 files changed, 48 insertions, 123 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05b481d7d39c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!PKGBUILD
+!yozo-office.install
diff --git a/PKGBUILD b/PKGBUILD
index 1e1e91c21dca..797ec029cb89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=yozo-office
 _pkgver=6.1.0418.131ZH.CL01
 pkgver=2013.$_pkgver
-pkgrel=2
+pkgrel=3
 pkgdesc="Yozo Office - An M$ Office Compatible Office Suit"
 url="http://www.yozosoft.com/person/"
 depends=('libxtst' 'libxt')
-optdepends=('ttf-ms-fonts: Arial, Times, Courier etc. fonts.'
-			'ttf-ms-fonts-zh_cn: SimSun, SimHei, ,MSYH, Tahoma etc. fonts')
+optdepends=('ttf-ms-fonts: Arial, Times, Courier etc.'
+			'ttf-ms-fonts-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.')
 options=('!strip')
 license=("unknown")
 source=("http://download.yozosoft.com/free/zh/2013/Yozo_Office_${_pkgver}.deb")
@@ -24,28 +24,39 @@ cd "$srcdir"
 tar zxf data.tar.gz
 mv usr etc "$pkgdir"
 
-tar zxf control.tar.gz
-
-cd "$startdir"
-cat /dev/null > $install
-echo "pre_install() {" >> $install
-tail -n+2 "$srcdir"/preinst >> $install
-echo "}" >> $install
-
-echo "pre_remove() {" >> $install
-tail -n+2 "$srcdir"/prerm >> $install
-echo "}" >> $install
-
-echo "pre_upgrade() {" >> $install
-echo "pre_remove" >> $install
-echo "}" >> $install
-
-echo "post_upgrade() {" >> $install
-echo "post_install" >> $install
-echo "}" >> $install
-
-echo "post_install() {" >> $install
-tail -n+2 "$srcdir"/postinst >> $install
-echo "}" >> $install
+targetP="${pkgdir}/usr/local/Yozosoft/Yozo_Office"
+unpackP="${targetP}/Jre/bin/unpack200"
+libP="${targetP}/Jre/lib"
+
+"$unpackP" -r "$libP/rt.pack.gz"        "$libP/rt.jar"
+"$unpackP" -r "$libP/jsse.pack.gz"      "$libP/jsse.jar"
+"$unpackP" -r "$libP/charsets.pack.gz"  "$libP/charsets.jar"
+"$unpackP" -r "$libP/plugin.pack.gz"    "$libP/plugin.jar"
+"$unpackP" -r "$libP/javaws.pack.gz"    "$libP/javaws.jar"
+"$unpackP" -r "$libP/deploy.pack.gz"    "$libP/deploy.jar"
+"$unpackP" -r "$libP/resources.pack.gz" "$libP/resources.jar"
+
+"$unpackP" -r "$libP/ext/localedata.pack.gz" \
+	"$libP/ext/localedata.jar"
+"$unpackP" -r "$libP/ext/bcprov-jdk14-124.pack.gz" \
+	"$libP/ext/bcprov-jdk14-124.jar"
+"$unpackP" -r "$libP/ext/jai_core.pack.gz" \
+	"$libP/ext/jai_core.jar"
+"$unpackP" -r "$libP/ext/tools.pack.gz" \
+	"$libP/ext/tools.jar"
+"$unpackP" -r "$libP/ext/ojdbc14.pack.gz" \
+	"$libP/ext/ojdbc14.jar"
+"$unpackP" -r "$libP/ext/mysql-connector-java-5.1.18-bin.pack.gz" \
+	"$libP/ext/mysql-connector-java-5.1.18-bin.jar"
+"$unpackP" -r "$libP/ext/swt.pack.gz"    "$libP/ext/swt.jar"
+"$unpackP" -r "$libP/ext/DJNativeSwing-SWT.pack.gz" \
+	"$libP/ext/DJNativeSwing-SWT.jar"
+"$unpackP" -r "$libP/ext/jhall.pack.gz" \
+	"$libP/ext/jhall.jar"
+"$unpackP" -r "$libP/ext/bcel-5.1.pack.gz" \
+	"$libP/ext/bcel-5.1.jar"
+
+"$unpackP" -r "${targetP}/Yozo_Office.pack.gz" \
+	"${targetP}/Yozo_Office.jar"
 
 }
diff --git a/yozo-office.install b/yozo-office.install
index 30bcd84f23fa..b044f035f9f6 100644
--- a/yozo-office.install
+++ b/yozo-office.install
@@ -1,101 +1,11 @@
-pre_install() {
-
-if [ "$1" = "install" ]; 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
-exit 0
-
-}
-pre_remove() {
-
-set -e
-
-if [ "$1" = "remove" ]; then
-echo "cancelling file association, waiting a while..."
-
-if [ -f /usr/local/Yozosoft/Yozo_Office/System/unpatch.ini ]; then
- while read line
- do
-  truncate=${line#*=}
-  if [ -f $truncate ]; then
-    rm -f $truncate
-  fi
- done < /usr/local/Yozosoft/Yozo_Office/System/unpatch.ini
-fi
-
-/usr/local/Yozosoft/Yozo_Office/Jre/bin/java -client -jar /usr/local/Yozosoft/Yozo_Office/Mimelnk/fileAssociate.jar -u
-
-rm -f $HOME/.Yozo_Office/UserConfig/BarData $HOME/.Yozo_Office/UserConfig/system.dll $HOME/.Yozo_Office/UserConfig/system0.dll $HOME/.Yozo_Office/UserConfig/system1.dll $HOME/.Yozo_Office/UserConfig/system2.dll $HOME/.Yozo_Office/UserConfig/systempdf.dll
-if [ -f /usr/local/Yozosoft/Yozo_Office/patcheio.log ] ; then
-	rm -f /usr/local/Yozosoft/Yozo_Office/patcheio.log
-fi
-rm -rf /usr/local/Yozosoft/Yozo_Office/System
-if [ -d $HOME/.Yozo_Office/CustomizedSEImages ]; then
-	rm -rf $HOME/.Yozo_Office/CustomizedSEImages
-fi
-
-	rm -f /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages/logicalData /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages/logicalData_0 /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages/logicalData_1 /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages/logicalData_2
-
-if [ -d /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages ]; then 
-	rmdir /usr/local/Yozosoft/Yozo_Office/ScienceEditorImages &>/dev/null
-fi
-
-rm -rf /usr/local/Yozosoft/Yozo_Office/Upgrade/Patch
-rm -rf /usr/local/Yozosoft/Yozo_Office/Upgrade/upgrade.log
-rm -f /usr/local/Yozosoft/Yozo_Office/Yozo_Office.jar 
-libP=/usr/local/Yozosoft/Yozo_Office/Jre/lib
-rm -rf $libP
-fi
-exit 0
-
-}
-pre_upgrade() {
-pre_remove
+post_install() {
+  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_install
 }
-post_install() {
-
-set -e
-
-unpackP=/usr/local/Yozosoft/Yozo_Office/Jre/bin/unpack200 
-libP=/usr/local/Yozosoft/Yozo_Office/Jre/lib
-if [ -f $libP/rt.pack.gz ]; then
-echo "unpack jar packages, wait a while."
-$unpackP -r $libP/rt.pack.gz $libP/rt.jar
-$unpackP -r $libP/jsse.pack.gz $libP/jsse.jar
-$unpackP -r $libP/charsets.pack.gz $libP/charsets.jar
-$unpackP -r $libP/plugin.pack.gz $libP/plugin.jar
-$unpackP -r $libP/javaws.pack.gz $libP/javaws.jar
-$unpackP -r $libP/deploy.pack.gz $libP/deploy.jar
-$unpackP -r $libP/resources.pack.gz $libP/resources.jar
-
-$unpackP -r $libP/ext/localedata.pack.gz $libP/ext/localedata.jar
-$unpackP -r $libP/ext/bcprov-jdk14-124.pack.gz $libP/ext/bcprov-jdk14-124.jar
-$unpackP -r $libP/ext/jai_core.pack.gz $libP/ext/jai_core.jar
-$unpackP -r $libP/ext/tools.pack.gz $libP/ext/tools.jar
-$unpackP -r $libP/ext/ojdbc14.pack.gz $libP/ext/ojdbc14.jar
-$unpackP -r $libP/ext/mysql-connector-java-5.1.18-bin.pack.gz $libP/ext/mysql-connector-java-5.1.18-bin.jar
-$unpackP -r $libP/ext/swt.pack.gz $libP/ext/swt.jar
-$unpackP -r $libP/ext/DJNativeSwing-SWT.pack.gz $libP/ext/DJNativeSwing-SWT.jar
-$unpackP -r $libP/ext/jhall.pack.gz $libP/ext/jhall.jar
-$unpackP -r $libP/ext/bcel-5.1.pack.gz $libP/ext/bcel-5.1.jar
-
-$unpackP -r /usr/local/Yozosoft/Yozo_Office/Yozo_Office.pack.gz /usr/local/Yozosoft/Yozo_Office/Yozo_Office.jar 
-fi
-
-if [ -z "$2" -a "$1" = "configure" ]; then
-echo "handling file association, waiting a while..."
-/usr/local/Yozosoft/Yozo_Office/Jre/bin/java -client -jar /usr/local/Yozosoft/Yozo_Office/Mimelnk/fileAssociate.jar -i
-fi
-exit 0
-
+post_remove() {
+  post_install
 }