Update server artifact name and include check()

3 files changed, 23 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 689e00776a70..1b7813525db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pkg
 src
 
 *.pkg.tar.xz
+.gradle
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index f0c12f3057b0..98bee6694ac7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tyler Cook <tcc@sandpolis.com>
 pkgbase=sandpolis-git
 pkgname=('sandpolis-server-git' 'sandpolis-viewer-git' 'sandpolis-viewer-cli-git')
-pkgver=r351.b31f2ec
+pkgver=r509.4a6d3e8
 pkgrel=1
 pkgdesc='Ultimate remote management utility'
 arch=('any')
@@ -13,16 +13,26 @@ source=("git+https://github.com/Subterranean-Security/Sandpolis.git")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/Sandpolis"
+  cd "$srcdir/Sandpolis"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "${srcdir}/Sandpolis"
-  ./gradlew assemble
-  ./gradlew -q :com.sandpolis.server:installDependencies <<< "$startdir/lib_sandpolis-server"
-  ./gradlew -q :com.sandpolis.viewer.jfx:installDependencies <<< "$startdir/lib_sandpolis-viewer"
-  ./gradlew -q :com.sandpolis.viewer.cli:installDependencies <<< "$startdir/lib_sandpolis-viewer-cli"
+  cd "$srcdir/Sandpolis"
+  ./gradlew -g "$startdir/.gradle" assemble
+
+  # Get Gradle to output all dependencies
+  ./gradlew -g "$startdir/.gradle" -q \
+      :com.sandpolis.server.vanilla:installDependencies <<< "$startdir/lib_sandpolis-server"
+  ./gradlew -g "$startdir/.gradle" -q \
+      :com.sandpolis.viewer.jfx:installDependencies <<< "$startdir/lib_sandpolis-viewer"
+  ./gradlew -g "$startdir/.gradle" -q \
+      :com.sandpolis.viewer.cli:installDependencies <<< "$startdir/lib_sandpolis-viewer-cli"
+}
+
+check() {
+  cd "$srcdir/Sandpolis"
+  ./gradlew -g "$startdir/.gradle" test
 }
 
 package_sandpolis-server-git() {
@@ -31,8 +41,8 @@ package_sandpolis-server-git() {
   install=sandpolis-server.install
 
   # Install binaries to /usr/share/java/sandpolis-server
-  install -m644 -D "$srcdir/Sandpolis/com.sandpolis.server/build/libs/com.sandpolis.server.jar" \
-      "$pkgdir/usr/share/java/sandpolis-server/com.sandpolis.server.jar"
+  install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.server.vanilla/build/libs/*.jar \
+      "$pkgdir/usr/share/java/sandpolis-server/com.sandpolis.server.vanilla.jar"
 
   # Install dependencies to /usr/share/java/sandpolis-server/lib
   mv "$startdir/lib_sandpolis-server" "$pkgdir/usr/share/java/sandpolis-server/lib"
@@ -58,7 +68,7 @@ package_sandpolis-viewer-git() {
   provides=('sandpolis-viewer')
 
   # Install binaries to /usr/share/java/sandpolis-viewer
-  install -m644 -D "$srcdir/Sandpolis/com.sandpolis.viewer.jfx/build/libs/com.sandpolis.viewer.jfx.jar" \
+  install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.viewer.jfx/build/libs/*.jar \
       "$pkgdir/usr/share/java/sandpolis-viewer/com.sandpolis.viewer.jfx.jar"
 
   # Install dependencies to /usr/share/java/sandpolis-viewer/lib
@@ -73,7 +83,7 @@ package_sandpolis-viewer-cli-git() {
   provides=('sandpolis-viewer-cli')
 
   # Install binaries to /usr/share/java/sandpolis-viewer-cli
-  install -m644 -D "$srcdir/Sandpolis/com.sandpolis.viewer.cli/build/libs/com.sandpolis.viewer.cli.jar" \
+  install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.viewer.cli/build/libs/*.jar \
       "$pkgdir/usr/share/java/sandpolis-viewer-cli/com.sandpolis.viewer.cli.jar"
 
   # Install dependencies to /usr/share/java/sandpolis-viewer-cli/lib
diff --git a/sandpolis-server.sh b/sandpolis-server.sh
index af15f9444492..de988dec81ca 100644
--- a/sandpolis-server.sh
+++ b/sandpolis-server.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/java -Dpath.db=/var/lib/sandpolis-server/db -Dpath.gen=/var/lib/sandpolis-server/gen -Dpath.log=/var/log/sandpolis-server -jar "/usr/share/java/sandpolis-server/com.sandpolis.server.jar" "$@"
+exec /usr/bin/java -Dserver.path.db=/var/lib/sandpolis-server/db -Dserver.path.gen=/var/lib/sandpolis-server/gen -Dpath.log=/var/log/sandpolis-server -jar "/usr/share/java/sandpolis-server/com.sandpolis.server.vanilla.jar" "$@"