diff options
author | Joan Figueras | 2022-01-03 22:08:31 +0100 |
---|---|---|
committer | Joan Figueras | 2022-01-03 22:08:31 +0100 |
commit | 603740e91a5eb3270280f170cce21fdcba3ebb17 (patch) | |
tree | 71c1d9a60813545df2ae37153bcebe6225f1866d | |
parent | e870d0d70ec752aa2f819d61be095f5422daf314 (diff) | |
download | aur-603740e91a5eb3270280f170cce21fdcba3ebb17.tar.gz |
1.4.0
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 35 | ||||
-rw-r--r-- | guacamole-client.install | 5 |
3 files changed, 28 insertions, 27 deletions
@@ -1,23 +1,22 @@ pkgbase = guacamole-client pkgdesc = Java and Maven components of Guacamole - pkgver = 1.3.0 + pkgver = 1.4.0 pkgrel = 1 url = http://guacamole.sourceforge.net/ install = guacamole-client.install arch = any license = GPL3 makedepends = maven - makedepends = jdk8-openjdk + makedepends = java-environment-openjdk<=17 depends = java-runtime depends = tomcat8 - depends = jre8-openjdk + depends = java-environment<=17 replaces = guacamole - backup = usr/share/tomcat8/.guacamole/guacamole.properties - backup = usr/share/tomcat8/.guacamole/user-mapping.xml - source = http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.3.0/source/guacamole-client-1.3.0.tar.gz + backup = etc/guacamole/guacamole.properties + backup = etc/guacamole/user-mapping.xml + source = http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.4.0/source/guacamole-client-1.4.0.tar.gz source = guacamole.properties - md5sums = c6395f57e92a0dd933de9f1d87039cb5 + md5sums = 8ec56d5e2e0ca2c5d0e4f7961b136e73 md5sums = 1f3ec0a32cc3c6b4f7aeb8a3b2e7531b pkgname = guacamole-client - @@ -2,40 +2,41 @@ # Contributor: Black_Codec <orso.f.regna@gmail.com> pkgname=guacamole-client -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="Java and Maven components of Guacamole" arch=('any') url="http://guacamole.sourceforge.net/" license=('GPL3') replaces=('guacamole') -depends=('java-runtime' 'tomcat8' 'jre8-openjdk') -makedepends=('maven' 'jdk8-openjdk') +depends=('java-runtime' 'tomcat8' 'java-environment<=17') +makedepends=('maven' 'java-environment-openjdk<=17') source=("http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${pkgver}/source/${pkgname}-${pkgver}.tar.gz" "guacamole.properties") install=guacamole-client.install -md5sums=('c6395f57e92a0dd933de9f1d87039cb5' +md5sums=('8ec56d5e2e0ca2c5d0e4f7961b136e73' '1f3ec0a32cc3c6b4f7aeb8a3b2e7531b') -backup=('usr/share/tomcat8/.guacamole/guacamole.properties' 'usr/share/tomcat8/.guacamole/user-mapping.xml') +backup=('etc/guacamole/guacamole.properties' 'etc/guacamole/user-mapping.xml') + +export JAVA_HOME=/usr/lib/jvm/default build() { - # force current Java to 1.8, if not, Guacamole doesn't build - if [ "$(archlinux-java get)" != "java-8-openjdk" ]; then - JAVA_HOME=/usr/lib/jvm/java-8-openjdk - PATH="$JAVA_HOME/bin:$PATH" + if [ "$(archlinux-java get | grep -Po '\d+')" -lt "17" ]; then + cd "$srcdir"/$pkgname-$pkgver + mvn package + else + echo "ERROR: Java environment needs to be set to any <=17. Java 8 and 11 are fine." + exit 1 fi - cd "$srcdir"/$pkgname-$pkgver - mvn package } package() { cd "$srcdir"/$pkgname-$pkgver - mkdir -m 775 -p "$pkgdir"/var/lib/tomcat8/ - mkdir -m 775 -p "$pkgdir"/var/lib/tomcat8/webapps/ - mkdir -p "$pkgdir"/usr/share/tomcat8/.${pkgname%-*}/ - install -D ${pkgname%-*}/target/${pkgname%-*}-$pkgver.war "$pkgdir"/var/lib/tomcat8/webapps/guacamole.war - install -D ${pkgname%-*}/doc/example/user-mapping.xml "$pkgdir"/usr/share/tomcat8/.guacamole/ - install -D "$srcdir"/guacamole.properties "$pkgdir"/usr/share/tomcat8/.guacamole/ + mkdir -m 775 -p "$pkgdir"/usr/share/guacamole/ + mkdir -p "$pkgdir"/etc/guacamole/ + install -D ${pkgname%-*}/target/${pkgname%-*}-$pkgver.war "$pkgdir"/usr/share/guacamole/guacamole.war + install -D ${pkgname%-*}/doc/example/user-mapping.xml "$pkgdir"/etc/guacamole/ + install -D "$srcdir"/guacamole.properties "$pkgdir"/etc/guacamole/ } diff --git a/guacamole-client.install b/guacamole-client.install index 1734d3ac6c21..8e37fe16ae4a 100644 --- a/guacamole-client.install +++ b/guacamole-client.install @@ -2,6 +2,7 @@ colorize post_upgrade() { - msg "War deployed to /var/lib/tomcat8/webapps/guacamole.war" - warning "Since version 1.0.0, webapp is named \'guacamole\'. Change your URI accordingly." + msg "NOTE 1: War by default is not deployed anymore. You can find the war here: /usr/share/guacamole/guacamole.war" + msg " You can make a symbolic link to your tomcat installation, for example: ln -s /usr/share/guacamole/guacamole.war /var/lib/tomcat9/webapps/" + msg "NOTE2: Now, this package provides default configuration files (GUACAMOLE_HOME) in /etc/guacamole directory. Remember to check your setup." } |