Upgrade to v5.59

This is now a .zip file, so the whole package() function was rewritten

2 files changed, 15 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc271a4f8a47..9f5ea302110a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = ostorybook
 	pkgdesc = Open Source Novel Writing Software for Novelists, Authors and Creative Writers
-	pkgver = 5.05.08
+	pkgver = 5.59
 	pkgrel = 1
 	url = http://ostorybook.tuxfamily.org
 	arch = any
 	license = GPL
 	depends = java-runtime>8
 	options = !strip
-	source = http://download.tuxfamily.org/ostorybook/current/oStorybook-5.05.08-linux.bin
-	sha256sums = 61989f0d8d5b5a78f094a4808c91cf351512273bceb6dbb5972b08b47412d96a
+	source = http://download.tuxfamily.org/ostorybook/current/oStorybook-5.59.zip
+	sha256sums = 315ced0bcaa59274289b90632e245aedc413a32149ba549a1be98d053733bcff
 
 pkgname = ostorybook
diff --git a/PKGBUILD b/PKGBUILD
index 74049e27d0ba..c516032d846c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,34 @@
 
 pkgname=ostorybook
 _pkgname=oStorybook
-pkgver=5.05.08
+pkgver=5.59
 pkgrel=1
 pkgdesc="Open Source Novel Writing Software for Novelists, Authors and Creative Writers"
 arch=(any)
 url="http://ostorybook.tuxfamily.org"
 license=(GPL)
 depends=('java-runtime>8')
-source=("http://download.tuxfamily.org/ostorybook/current/oStorybook-${pkgver}-linux.bin")
-sha256sums=('61989f0d8d5b5a78f094a4808c91cf351512273bceb6dbb5972b08b47412d96a')
+source=("http://download.tuxfamily.org/ostorybook/current/oStorybook-${pkgver}.zip")
+sha256sums=('315ced0bcaa59274289b90632e245aedc413a32149ba549a1be98d053733bcff')
 options=('!strip')
 
 package()
 {
- 
-  chmod +x "${_pkgname}"-"${pkgver}"-linux.bin
-  mkdir -p "${pkgdir}"/usr/share/"${_pkgname}"
-  ./"${_pkgname}"-"${pkgver}"-linux.bin --noexec --keep --target "${pkgdir}"/usr/share/"${_pkgname}"
-  mkdir -p "${pkgdir}"/usr/bin
-  USRBINFILE="${pkgdir}"/usr/bin/"${_pkgname}"
-  echo '#!/bin/bash' > "${USRBINFILE}"
-  echo "cd /usr/share/${_pkgname}" >> "${USRBINFILE}"
-  echo "java -Xmx256m -splash:splash.png -jar ${_pkgname}.jar" >> "${USRBINFILE}"
-  chmod +x "${USRBINFILE}"
-  mkdir -p "${pkgdir}"/usr/share/applications
-  DESKTOPFILE="${pkgdir}"/usr/share/applications/"${_pkgname}".desktop
+  install --mode 755 -D -T "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+  install -D -t "${pkgdir}/usr/share/${pkgname}" ./*.*
+  cp -r Assistant "${pkgdir}/usr/share/${pkgname}"
+  cp -r lib "${pkgdir}/usr/share/${pkgname}"
+  
+  # Create Desktop file
+  install -d "${pkgdir}/usr/share/applications"
+  DESKTOPFILE="${pkgdir}/usr/share/applications/${_pkgname}.desktop"
   echo "[Desktop Entry]" > "${DESKTOPFILE}"
   echo "Name=${_pkgname}" >> "${DESKTOPFILE}"
   echo "Comment=Open Source Novel Writing Software for Novelists, Authors and Creative Writers" >> "${DESKTOPFILE}"
   echo "Exec=${_pkgname}" >> "${DESKTOPFILE}"
   echo "Terminal=false" >> "${DESKTOPFILE}"
   echo "Type=Application" >> "${DESKTOPFILE}"
-  echo "Icon=/usr/share/${_pkgname}/${_pkgname}-icon.png" >> "${DESKTOPFILE}"
+  echo "Icon=/usr/share/${pkgname}/${_pkgname}-icon.png" >> "${DESKTOPFILE}"
   echo "Categories=Office;" >> "${DESKTOPFILE}"
 }