- changed gradle task for a complete build

- version bump to 8.3.0
- moved executable and desktop file outside of PKGBUILD, removed PNG
- added quotes to argument parser in executable so more types of arguments are properly parsed
- cleaned up PKGBUILD

1 files changed, 21 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e2e3cb027e83..86ae42445727 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,41 @@
-# Maintainer: Tinxy <arch æŧ tinx ðøŧ eu>
+# Maintainer: Jean Lucas <jean@4ray.co>
+# Contributor: Tinxy <arch æŧ tinx ðøŧ eu>
 
-_basename='scenebuilder'
+_basename=scenebuilder
 _appname="gluon-${_basename}"
 pkgname="javafx-${_appname}"
-pkgver='8.2.0'
+pkgver=8.3.0
 pkgrel=1
+pkgdesc="Open-source drag & drop UI design tool for JavaFX by Gluon"
 arch=('any')
-pkgdesc='An open source tool that allows for drag and drop design of JavaFX user interfaces.'
-url='http://gluonhq.com/labs/scene-builder/'
+url="https://gluonhq.com/products/scene-builder/"
 license=('BSD')
 depends=('java-environment>=8' 'java-openjfx')
 makedepends=('mercurial' 'gradle')
+conflicts=('gluon-scenebuilder')
 source=("${_basename}::hg+https://bitbucket.org/gluon-oss/scenebuilder#tag=${pkgver}"
-        "${_appname}_base.desktop"
-        "${_appname}.png")
+        "${_appname}.sh"
+        "${_appname}.desktop")
 sha256sums=('SKIP'
-            '8bd4f4a9ae2f687a25cd00b8319f582ca37bad96054761bcfa970d2cfae210af'
-            'b77517f70237350a26fca72b19222fc1d669704ed8aa9125d85b73f10afa1907')
+            'be575929e72b20f8cbeef6118d13b02783f72206053339a9fcbae21bd7f4b933'
+            '85012a1c560592cc0e76d762f1351758d75f6d1ac61eadb3b3b12e21319207fa')
 
 prepare() {
-  # Prepare start script
-  echo "#!/bin/bash" > "${srcdir}/${_appname}"
-  echo "exec java -jar /opt/${_appname}/${_appname}.jar $@" >> "${srcdir}/${_appname}"
-  # Prepare Desktop file
-  cat "${srcdir}/${_appname}_base.desktop" > "${srcdir}/${_appname}.desktop"
-  echo "Exec=/usr/bin/${_appname}" >> "${srcdir}/${_appname}.desktop"
-  echo "Icon=/usr/share/pixmaps/${_appname}.png" >> "${srcdir}/${_appname}.desktop"
+  # Correct build version
+  msg2 "Correcting build version..."
+  sed -e "s|^\(version = tryGetProperty('VERSION',\).*|\1'${pkgver}')|g" -i "${srcdir}/${_basename}/build.gradle"
 }
 
 build() {
   cd "${srcdir}/${_basename}"
-  gradle jar
+  ./gradlew shadowJar
 }
 
 package() {
-  install -d "${pkgdir}/opt/${_appname}" \
-             "${pkgdir}/usr/bin" \
-             "${pkgdir}/usr/share/applications" \
-             "${pkgdir}/usr/share/licenses/${_appname}" \
-             "${pkgdir}/usr/share/pixmaps"
-  
-  install -m755 "${srcdir}/${_basename}/build/libs/${_basename}-${pkgver}-SNAPSHOT.jar" "${pkgdir}/opt/${_appname}/${_appname}.jar"
-  install -m755 "${srcdir}/${_appname}" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/${_appname}.desktop" "${pkgdir}/usr/share/applications/"
-  install -m644 "${srcdir}/${_basename}/build/resources/main/LICENSE" "${pkgdir}/usr/share/licenses/${_appname}/"
-  install -m644 "${srcdir}/${_appname}.png" "${pkgdir}/usr/share/pixmaps/"
+  cd "${srcdir}"
+  install -Dm 0755 "${_basename}/build/libs/${_basename}-all-${pkgver}-all.jar" "${pkgdir}/opt/${_appname}/${_appname}.jar"
+  install -Dm 0755 "${_appname}.sh" "${pkgdir}/usr/bin/${_appname}"
+  install -Dm 0644 "${_appname}.desktop" "${pkgdir}/usr/share/applications/${_appname}.desktop"
+  install -Dm 0644 "${_basename}/src/main/resources/com/oracle/javafx/${_basename}/app/about/${_basename}-logo.png" "${pkgdir}/usr/share/pixmaps/${_appname}.png"
+  install -Dm 0644 "${_basename}/build/resources/main/LICENSE" "${pkgdir}/usr/share/licenses/${_appname}/LICENSE"
 }