summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorcelogeek2022-03-26 15:12:34 +0100
committercelogeek2022-03-26 15:12:34 +0100
commit8ae9358edd272ecb9635299041063272552df2be (patch)
tree2cd817a268a4bdd918d105ea9344f9482628ee43
parentaefe30e9ee3496220a12ec2f199585713b75857b (diff)
downloadaur-8ae9358edd272ecb9635299041063272552df2be.tar.gz
fix java path
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--config2
-rw-r--r--service1
4 files changed, 7 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fe84ac46704b..96a9d144697e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jicofo-nightly-bin
pkgdesc = JItsi meet COnference FOcus nightly binary
pkgver = 1.0+871
- pkgrel = 1
+ pkgrel = 2
url = https://jitsi.org/jitsi-meet/
install = install
arch = any
@@ -25,9 +25,9 @@ pkgbase = jicofo-nightly-bin
source = sysusers.conf
source = tmpfiles.conf
sha256sums = b14b449f64a4ef4ecbd78b0d87987cf17f52207e461aafa59aec6c3c91f7ca44
- sha256sums = c83256640bacae259becad4d9de3711e8a0511009c9f8f08b9f4c4a2e479c776
+ sha256sums = e0e42bb77b6c60e2a2d5ad57b12365166e90b91e53c91062909d578808d5e00c
sha256sums = f295f5f8ee13edd019defc037c60e04c6ea2d30e69cc4a896c010b8570f5efab
- sha256sums = 8de1e1ac3b20795a69e5932f52108e187769cc6e2c19833b4baf55518c3b9933
+ sha256sums = 59c6a682953a9981af90d111901b3637a79ff42d39d1fbd5fa22730ec4148762
sha256sums = 0681e97ca1e06d8ea7bdec0a874c6fc7a6ea84628923005130cd444547a1b440
sha256sums = a8e5ff30f3737da564f61e7d00cc6e0a8b243da54aa02f94095deaa2f4cceb66
diff --git a/PKGBUILD b/PKGBUILD
index 2fef65a6a4f2..56d2818f2b8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _url=https://download.jitsi.org/unstable/jicofo_1.0-871-1_all.deb
_pkgbase=${_basename}-nightly
pkgname=${_pkgbase}-bin
pkgver=${_version}
-pkgrel=1
+pkgrel=2
pkgdesc="JItsi meet COnference FOcus nightly binary"
arch=('any')
url="https://jitsi.org/jitsi-meet/"
@@ -66,8 +66,8 @@ package() {
install -Dm644 "tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgbase}.conf"
}
sha256sums=('b14b449f64a4ef4ecbd78b0d87987cf17f52207e461aafa59aec6c3c91f7ca44'
- 'c83256640bacae259becad4d9de3711e8a0511009c9f8f08b9f4c4a2e479c776'
+ 'e0e42bb77b6c60e2a2d5ad57b12365166e90b91e53c91062909d578808d5e00c'
'f295f5f8ee13edd019defc037c60e04c6ea2d30e69cc4a896c010b8570f5efab'
- '8de1e1ac3b20795a69e5932f52108e187769cc6e2c19833b4baf55518c3b9933'
+ '59c6a682953a9981af90d111901b3637a79ff42d39d1fbd5fa22730ec4148762'
'0681e97ca1e06d8ea7bdec0a874c6fc7a6ea84628923005130cd444547a1b440'
'a8e5ff30f3737da564f61e7d00cc6e0a8b243da54aa02f94095deaa2f4cceb66')
diff --git a/config b/config
index 7975a3c59efa..98729196f3d2 100644
--- a/config
+++ b/config
@@ -27,5 +27,3 @@ JAVA_SYS_PROPS="\
-Djava.util.prefs.userRoot=/var/lib/jicofo-nightly\
"
-# use java11
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk
diff --git a/service b/service
index e103e95149a0..f4e4734fed89 100644
--- a/service
+++ b/service
@@ -3,6 +3,7 @@ Description=Jitsi-Meet Conference Focus
After=network-online.target
[Service]
+Environment=PATH=/usr/lib/jvm/java-11-openjdk/bin:/bin:/usr/bin:/usr/local/bin
EnvironmentFile=/etc/jicofo-nightly/config
User=jicofo
ExecStart=/usr/lib/jicofo-nightly/jicofo.sh --host=${JICOFO_HOST} --domain=${JICOFO_HOSTNAME} --user_name=${JICOFO_AUTH_USER} --user_domain=${JICOFO_AUTH_DOMAIN} ${JICOFO_OPTS}