summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Stenzel2016-06-08 18:31:01 +0200
committerSebastian Stenzel2016-06-08 18:31:01 +0200
commit10964de77c5706407af9e7cad36a5580dd8d8906 (patch)
tree922f37c76f6d3177ac1d36f00936729c506e34c1
parent4e6a2564f689fea0e51917cf1cc6327eb047d37a (diff)
downloadaur-10964de77c5706407af9e7cad36a5580dd8d8906.tar.gz
applied changes regarding jdk path and jre dependency
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
-rw-r--r--cryptomator.sh1
3 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c8a4561483f..d7f6c8a11e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,15 +5,16 @@ pkgbase = cryptomator
url = https://cryptomator.org/
arch = any
license = MIT/X Consortium License
+ makedepends = jdk8-openjdk
makedepends = apache-ant
- depends = jre8-openjdk
+ depends = java-runtime=8
depends = java-openjfx
source = antkit-1.1.0.tar.gz::https://github.com/cryptomator/cryptomator/releases/download/1.1.0/antkit.tar.gz
source = cryptomator.sh
source = cryptomator.desktop
source = cryptomator-vault.xml
sha256sums = SKIP
- sha256sums = 0bc12ee603ef87536389aeb85bf0afaf8995bae2c9ed826290b2bb0d838a9766
+ sha256sums = 031fbf7f62fe27d496c42f71818e19aa9d4a9920df3228ac032bb795e81c30b7
sha256sums = 1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464
sha256sums = 78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad
diff --git a/PKGBUILD b/PKGBUILD
index 0cc3ef718af..41eb7cac2a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,19 +8,19 @@ pkgdesc="Multiplatform transparent client-side encryption of your files in the c
arch=("any")
url="https://cryptomator.org/"
license=('MIT/X Consortium License')
-depends=('jre8-openjdk' 'java-openjfx')
-makedepends=('apache-ant')
+depends=('java-runtime=8' 'java-openjfx')
+makedepends=('jdk8-openjdk' 'apache-ant')
source=("antkit-${pkgver}.tar.gz::https://github.com/cryptomator/cryptomator/releases/download/${pkgver}/antkit.tar.gz"
'cryptomator.sh'
'cryptomator.desktop'
'cryptomator-vault.xml')
sha256sums=('SKIP'
- '0bc12ee603ef87536389aeb85bf0afaf8995bae2c9ed826290b2bb0d838a9766'
+ '031fbf7f62fe27d496c42f71818e19aa9d4a9920df3228ac032bb795e81c30b7'
'1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464'
'78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad')
build() {
- export JAVA_HOME=/usr/lib/jvm/default-runtime/
+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk/jre/
ant create-jar
}
package() {
diff --git a/cryptomator.sh b/cryptomator.sh
index 090d5286a0e..bc679567bac 100644
--- a/cryptomator.sh
+++ b/cryptomator.sh
@@ -1,2 +1,3 @@
#!/bin/sh
+export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
exec /usr/bin/java -jar '/usr/share/java/cryptomator/cryptomator.jar' "$@"