bump version

2 files changed, 31 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07c974d68865..05559e4a2850 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = universal-gcode-sender
 	pkgdesc = Java based GRBL compatible cross-platform G-Code sender
-	pkgver = 1.0.9
+	pkgver = 2.0.6
 	pkgrel = 1
 	url = https://github.com/winder/Universal-G-Code-Sender
 	arch = any
 	license = GPL3
-	makedepends = maven
-	depends = java-environment>=8
+	makedepends = jdk8
+	makedepends = npm
+	depends = jre8
+	depends = npm
 	provides = universal-gcode-sender
 	conflicts = universal-gcode-sender-git
-	source = https://github.com/winder/Universal-G-Code-Sender/archive/v1.0.9.tar.gz
-	md5sums = f898607e51cd397b040550fab00911bf
+	source = https://github.com/winder/Universal-G-Code-Sender/archive/v2.0.6.tar.gz
+	md5sums = ac25e62348d9378e40487f884b770ecf
 
 pkgname = universal-gcode-sender
 
diff --git a/PKGBUILD b/PKGBUILD
index 4230d817876c..3998f9157bd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,41 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 pkgname=universal-gcode-sender
-pkgver=1.0.9
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="Java based GRBL compatible cross-platform G-Code sender"
-arch=('any')
+arch=(any)
 url="https://github.com/winder/Universal-G-Code-Sender"
-license=('GPL3')
-depends=('java-environment>=8')
-makedepends=('maven')
-provides=('universal-gcode-sender')
-conflicts=('universal-gcode-sender-git')
+license=(GPL3)
+makedepends=(jdk8 npm)
+depends=(jre8 npm)
+provides=(universal-gcode-sender)
+conflicts=(universal-gcode-sender-git)
 source=("https://github.com/winder/Universal-G-Code-Sender/archive/v${pkgver}.tar.gz")
-md5sums=('f898607e51cd397b040550fab00911bf')
+md5sums=('ac25e62348d9378e40487f884b770ecf')
 
-build() {
+prepare() {
   cd "${srcdir}/Universal-G-Code-Sender-${pkgver}"
-  mvn package -DskipTests
+  export MAVEN_OPTS="-Xmx2048m"
+  mvn --batch-mode validate
 }
 
-check() {
+build() {
   cd "${srcdir}/Universal-G-Code-Sender-${pkgver}"
-  mvn test
+  mvn --batch-mode package
 }
 
 package() {
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  cp "${srcdir}/Universal-G-Code-Sender-${pkgver}/target/UniversalGcodeSender.jar" "${pkgdir}/opt/${pkgname}/."
-  cp "${srcdir}/Universal-G-Code-Sender-${pkgver}/release_files/start.sh" "${pkgdir}/opt/${pkgname}/."
-  chmod +x "${pkgdir}/opt/${pkgname}/start.sh"
+  mkdir -p "${pkgdir}/opt/universal-gcode-sender"
+
+  # classic
+  cp "${srcdir}/Universal-G-Code-Sender-${pkgver}/ugs-classic/target/UniversalGcodeSender.jar" "${pkgdir}/opt/universal-gcode-sender/."
+  cp "${srcdir}/Universal-G-Code-Sender-${pkgver}/ugs-classic/release_files/start.sh" "${pkgdir}/opt/universal-gcode-sender/."
+  chmod +x "${pkgdir}/opt/universal-gcode-sender/start.sh"
+  
+  # platform
+  cp -a "${srcdir}/Universal-G-Code-Sender-${pkgver}/ugs-platform/application/target/ugsplatform" "${pkgdir}/opt/universal-gcode-sender/."
 
   mkdir -p "${pkgdir}/usr/bin"
-  ln -s "/opt/${pkgname}/start.sh" "${pkgdir}/usr/bin/ugs"
+  ln -s "/opt/universal-gcode-sender/start.sh" "${pkgdir}/usr/bin/ugs-clasic"
+  ln -s "/opt/universal-gcode-sender/ugsplatform/bin/ugsplatform" "${pkgdir}/usr/bin/ugs"
 }