diff options
author | Tyler Cook | 2019-11-23 01:21:21 -0600 |
---|---|---|
committer | Tyler Cook | 2019-11-23 01:21:21 -0600 |
commit | 51c126f3107bd87510ea20eef2ef2da5565aba77 (patch) | |
tree | e804629f5d2ee312e9241c999af0ded16f7eef60 | |
parent | 3dd924e2ecb03a6f7035604f270103f0b7ac97d3 (diff) | |
download | aur-51c126f3107bd87510ea20eef2ef2da5565aba77.tar.gz |
Update to 5.1.1
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 72 | ||||
-rw-r--r-- | sandpolis-server.install | 2 | ||||
-rw-r--r-- | sandpolis-server.sh | 2 | ||||
-rw-r--r-- | sandpolis-viewer-cli.sh | 2 | ||||
-rw-r--r-- | sandpolis-viewer.sh | 2 |
6 files changed, 46 insertions, 40 deletions
@@ -1,13 +1,13 @@ pkgbase = sandpolis-git pkgdesc = Ultimate remote management utility - pkgver = r509.4a6d3e8 + pkgver = r750.4a370c73 pkgrel = 1 url = https://github.com/Subterranean-Security/Sandpolis arch = any license = Apache 2 - makedepends = java-environment>=11 + makedepends = java-environment>=13 makedepends = git - depends = java-runtime>=11 + depends = java-runtime>=13 source = git+https://github.com/Subterranean-Security/Sandpolis.git sha512sums = SKIP @@ -1,14 +1,14 @@ # Maintainer: Tyler Cook <tcc@sandpolis.com> pkgbase=sandpolis-git pkgname=('sandpolis-server-git' 'sandpolis-viewer-git' 'sandpolis-viewer-cli-git') -pkgver=r509.4a6d3e8 +pkgver=r750.4a370c73 pkgrel=1 pkgdesc='Ultimate remote management utility' arch=('any') url='https://github.com/Subterranean-Security/Sandpolis' license=('Apache 2') -depends=('java-runtime>=11') -makedepends=('java-environment>=11' 'git') +depends=('java-runtime>=13') +makedepends=('java-environment>=13' 'git') source=("git+https://github.com/Subterranean-Security/Sandpolis.git") sha512sums=('SKIP') @@ -19,20 +19,12 @@ pkgver() { build() { 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" + ./gradlew --no-daemon -g "$startdir/.gradle" jar } check() { cd "$srcdir/Sandpolis" - ./gradlew -g "$startdir/.gradle" test + ./gradlew --no-daemon -g "$startdir/.gradle" test } package_sandpolis-server-git() { @@ -40,25 +32,27 @@ package_sandpolis-server-git() { provides=('sandpolis-server') install=sandpolis-server.install - # Install binaries to /usr/share/java/sandpolis-server - install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.server.vanilla/build/libs/*.jar \ - "$pkgdir/usr/share/java/sandpolis-server/com.sandpolis.server.vanilla.jar" + cd "$srcdir/Sandpolis" - # Install dependencies to /usr/share/java/sandpolis-server/lib - mv "$startdir/lib_sandpolis-server" "$pkgdir/usr/share/java/sandpolis-server/lib" + # Install libraries + ./gradlew --no-daemon -q -g "$startdir/.gradle" \ + -Dlib_dest="$pkgdir/usr/share/java/sandpolis-server/lib" :com.sandpolis.server.vanilla:install - # Install script stubs to /usr/bin + # Install scripts install -m755 -D "$startdir/sandpolis-server.sh" "$pkgdir/usr/bin/sandpolis-server" - # Setup database directory in /var/lib/sandpolis-server/db + # Setup database directory install -d "$pkgdir/var/lib/sandpolis-server/db" - # Setup gen directory in /var/lib/sandpolis-server/gen + # Setup gen directory install -d "$pkgdir/var/lib/sandpolis-server/gen" - # Setup log directory in /var/log/sandpolis-server + # Setup log directory install -d "$pkgdir/var/log/sandpolis-server" + # Setup plugin directory + install -d "$pkgdir/usr/share/java/sandpolis-server/plugin" + # Install systemd unit install -m644 -D "$startdir/sandpolis-server.service" "$pkgdir/usr/lib/systemd/system/sandpolisd.service" } @@ -67,28 +61,38 @@ package_sandpolis-viewer-git() { conflicts=('sandpolis-viewer') provides=('sandpolis-viewer') - # Install binaries to /usr/share/java/sandpolis-viewer - install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.viewer.jfx/build/libs/*.jar \ - "$pkgdir/usr/share/java/sandpolis-viewer/com.sandpolis.viewer.jfx.jar" + cd "$srcdir/Sandpolis" - # Install dependencies to /usr/share/java/sandpolis-viewer/lib - mv "$startdir/lib_sandpolis-viewer" "$pkgdir/usr/share/java/sandpolis-viewer/lib" + # Install libraries + ./gradlew --no-daemon -q -g "$startdir/.gradle" \ + -Dlib_dest="$pkgdir/usr/share/java/sandpolis-viewer/lib" :com.sandpolis.viewer.jfx:install - # Install script stubs to /usr/bin + # Install scripts install -m755 -D "$startdir/sandpolis-viewer.sh" "$pkgdir/usr/bin/sandpolis-viewer" + + # Setup log directory + install -d "$pkgdir/var/log/sandpolis-viewer" + + # Setup plugin directory + install -d "$pkgdir/usr/share/java/sandpolis-viewer/plugin" } package_sandpolis-viewer-cli-git() { conflicts=('sandpolis-viewer-cli') provides=('sandpolis-viewer-cli') - # Install binaries to /usr/share/java/sandpolis-viewer-cli - install -m644 -D "$srcdir"/Sandpolis/com.sandpolis.viewer.cli/build/libs/*.jar \ - "$pkgdir/usr/share/java/sandpolis-viewer-cli/com.sandpolis.viewer.cli.jar" + cd "$srcdir/Sandpolis" - # Install dependencies to /usr/share/java/sandpolis-viewer-cli/lib - mv "$startdir/lib_sandpolis-viewer-cli" "$pkgdir/usr/share/java/sandpolis-viewer-cli/lib" + # Install libraries + ./gradlew --no-daemon -q -g "$startdir/.gradle" \ + -Dlib_dest="$pkgdir/usr/share/java/sandpolis-viewer-cli/lib" :com.sandpolis.viewer.cli:install - # Install script stubs to /usr/bin + # Install scripts install -m755 -D "$startdir/sandpolis-viewer-cli.sh" "$pkgdir/usr/bin/sandpolis-viewer-cli" + + # Setup log directory + install -d "$pkgdir/var/log/sandpolis-viewer-cli" + + # Setup plugin directory + install -d "$pkgdir/usr/share/java/sandpolis-viewer-cli/plugin" } diff --git a/sandpolis-server.install b/sandpolis-server.install index 35b2e4eb75af..57cbe68f458b 100644 --- a/sandpolis-server.install +++ b/sandpolis-server.install @@ -2,6 +2,8 @@ post_install() { useradd -M -s /bin/false sandpolis chown sandpolis /var/lib/sandpolis-server/db chown sandpolis /var/lib/sandpolis-server/gen + chown sandpolis /var/log/sandpolis-server + chown -R sandpolis /usr/share/java/sandpolis-server } post_remove() { diff --git a/sandpolis-server.sh b/sandpolis-server.sh index de988dec81ca..9153dbe48c5b 100644 --- a/sandpolis-server.sh +++ b/sandpolis-server.sh @@ -1,2 +1,2 @@ #!/bin/sh -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" "$@" +exec /usr/bin/java -Dpath.db=/var/lib/sandpolis-server/db -Dpath.gen=/var/lib/sandpolis-server/gen -Dpath.log=/var/log/sandpolis-server --module-path /usr/share/java/sandpolis-server/lib -m com.sandpolis.server.vanilla/com.sandpolis.server.vanilla.Main "$@" diff --git a/sandpolis-viewer-cli.sh b/sandpolis-viewer-cli.sh index 20cf4bc4aa7c..4193a7e44b42 100644 --- a/sandpolis-viewer-cli.sh +++ b/sandpolis-viewer-cli.sh @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/java -jar "/usr/share/java/sandpolis-viewer-cli/com.sandpolis.viewer.cli.jar" "$@" +exec /usr/bin/java -Dpath.log=/var/log/sandpolis-viewer-cli --module-path /usr/share/java/sandpolis-viewer-cli/lib -m com.sandpolis.viewer.cli/com.sandpolis.viewer.cli.Main "$@"
\ No newline at end of file diff --git a/sandpolis-viewer.sh b/sandpolis-viewer.sh index 9404f5052439..43eb472da072 100644 --- a/sandpolis-viewer.sh +++ b/sandpolis-viewer.sh @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/java -jar "/usr/share/java/sandpolis-viewer/com.sandpolis.viewer.jfx.jar" "$@" +exec /usr/bin/java -Dpath.log=/var/log/sandpolis-viewer --module-path /usr/share/java/sandpolis-viewer/lib -m com.sandpolis.viewer.jfx/com.sandpolis.viewer.jfx.Main "$@"
\ No newline at end of file |