Rework of the package was done

 - added provides()
 - uses 'gradle clean build' as suggested in project README.md
 - get right version from 'version.properties' file, if available
 - 'kse' startup script is now in bin directory

1 files changed, 26 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4e314a77b481..67709639f269 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,49 +2,59 @@
 # If you think this package is shit, contact me with patch
 
 pkgname=keystore-explorer-git
-pkgver=v5.4.4+2+gad9cbc5
+pkgver=v5.4.4+9+gbdf6b5f
 pkgrel=1
 pkgdesc="KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner."
+_pkgname=keystore-explorer
+_short_pkgname=kse
+_short_pkgver=5.4.4
 arch=('any')
 url="https://keystore-explorer.org/"
 license=('GPLv3')
 depends=('java-environment' 'bash' 'desktop-file-utils')
-makedepends=( 'unzip' 'gradle' 'java-environment')
+makedepends=('unzip' 'gradle' 'java-environment')
 conflicts=('keystore-explorer' 'keystore-explorer-bin')
-source=('git+file:///tmp/keystore-explorer')
+provides=('keystore-explorer')
 source=('git+https://github.com/kaikramer/keystore-explorer.git')
 sha256sums=('SKIP')
-_pkgname=keystore-explorer
-_short_pkgname=kse
-_short_pkgver=544
 
 pkgver() {
-  cd $_pkgname
+  cd ${_pkgname}
   git describe --tags | sed 's/-/+/g'
 }
 
 build() {
   cd "${_pkgname}/${_short_pkgname}"
-  gradle zip # -g .gradle
+
+  # get current version from source
+  _v=$(grep 'KSE.Version' src/org/${_short_pkgname}/version.properties | sed 's/KSE.Version=//')
+  export _current_short_pkgver=${_v:-$_short_pkgver}
+
+  # build it
+  gradle clean build
+
+  # extract freshly built dist file
   cd "${srcdir}"
-  unzip -o ${_pkgname}/${_short_pkgname}/build/distributions/${_short_pkgname}-${_short_pkgver}.zip
+  unzip -o ${_pkgname}/${_short_pkgname}/build/distributions/${_short_pkgname}-${_current_short_pkgver}.zip
 }
 
 package() {
-  cd "${srcdir}/${_short_pkgname}-${_short_pkgver}"
+  cd "${_short_pkgname}-${_current_short_pkgver}"
 
   # create dir structure in pkgdir
   install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}/opt/${_pkgname}/bin"
   install -d "${pkgdir}/opt/${_pkgname}/licenses"
   install -d "${pkgdir}/opt/${_pkgname}/lib"
 
   # copy app files
-  install -D -m644 *.jar "${pkgdir}"/opt/"${_pkgname}"
-  install -D -m755 kse.sh "${pkgdir}"/opt/"${_pkgname}"
-  install -D -m644 readme.txt "${pkgdir}"/opt/"${_pkgname}"
-  install -D -m644 licenses/license-*.txt "${pkgdir}/opt/${_pkgname}/licenses"
+  install -D -m755 bin/kse   "${pkgdir}/opt/${_pkgname}/bin"
   install -D -m644 lib/*.jar "${pkgdir}/opt/${_pkgname}/lib"
 
+  # copy some reading material
+  install -D -m644 ${srcdir}/${_pkgname}/${_short_pkgname}/res/readmes/readme.txt "${pkgdir}/opt/${_pkgname}"
+  install -D -m644 ${srcdir}/${_pkgname}/${_short_pkgname}/res/licenses/license-*.txt "${pkgdir}/opt/${_pkgname}/licenses"
+  
   # install desktop file to system
   install -D -m644 ${srcdir}/${_pkgname}/${_short_pkgname}/res/kse.desktop ${pkgdir}/usr/share/applications/kse.desktop
 
@@ -54,7 +64,7 @@ package() {
       ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/kse.png
   done
 
-  # provide 'kse' executable
-  ln -sf /opt/${_pkgname}/kse.sh "${pkgdir}/usr/bin/kse"
+  # provide 'kse' command
+  ln -sf /opt/${_pkgname}/bin/${_short_pkgname} "${pkgdir}/usr/bin/${_short_pkgname}"
 
 }
\ No newline at end of file