Updated to 1.4.0, based on new AppImage release format

6 files changed, 22 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2520fcf5a4a8..8118c905dc8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,19 @@
 # Generated by mksrcinfo v8
-# Wed Apr  4 22:36:12 UTC 2018
+# Tue Nov  6 11:04:12 UTC 2018
 pkgbase = cryptomator
 	pkgdesc = Multiplatform transparent client-side encryption of your files in the cloud.
-	pkgver = 1.3.5
+	pkgver = 1.4.0
 	pkgrel = 1
 	url = https://cryptomator.org/
 	arch = any
 	license = GPL3
-	makedepends = java-runtime-openjdk=8
-	makedepends = apache-ant
-	depends = java-runtime=8
-	depends = java-openjfx
-	source = antkit-1.3.5.tar.gz::https://github.com/cryptomator/cryptomator/releases/download/1.3.5/antkit.tar.gz
-	source = cryptomator.sh
+	source = cryptomator-1.4.0-x86_64.AppImage::https://dl.bintray.com/cryptomator/cryptomator/cryptomator-1.4.0-x86_64.AppImage
 	source = cryptomator.desktop
+	source = cryptomator.png
 	source = cryptomator-vault.xml
-	source = logback.xml
-	sha256sums = e38ca7f218ac803522f27d60e5af5040342922144da305c7752c98719179b8ed
-	sha256sums = 544b707a5e5d5d2f7694b6044f9bedc8a4bb7a783bc427d6c46bf7d3a22eaa1f
-	sha256sums = 1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464
+	sha256sums = 6eeb34b4979d03102e7ec11e7d931f6cd7710a1627e64b362e59bd12609205fc
+	sha256sums = 5f82b1846e5db21fcca2fb914321eecbc9906c8580ef4318d6a12c011e1e3285
+	sha256sums = fb1213c07d01c86757744507a151b37d4e917b69965a7db6d28bd99fcc735e6b
 	sha256sums = 78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad
-	sha256sums = 913c7995d51f305c36a81cda9cbce96c9481a04516ccc57024f33590e1c822ea
 
 pkgname = cryptomator
diff --git a/PKGBUILD b/PKGBUILD
index a8f157c620cf..7052a16bc9e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,27 @@
 # Contributor: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 
 pkgname=cryptomator
-pkgver=1.3.5
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Multiplatform transparent client-side encryption of your files in the cloud."
-arch=("any")
+arch=('x86_64')
 url="https://cryptomator.org/"
 license=('GPL3')
-depends=('java-runtime=8' 'java-openjfx')
-makedepends=('java-runtime-openjdk=8' 'apache-ant')
-source=("antkit-${pkgver}.tar.gz::https://github.com/cryptomator/cryptomator/releases/download/${pkgver}/antkit.tar.gz"
-        'cryptomator.sh'
+source=("cryptomator-${pkgver}-x86_64.AppImage::https://dl.bintray.com/cryptomator/cryptomator/cryptomator-${pkgver}-x86_64.AppImage"
         'cryptomator.desktop'
-        'cryptomator-vault.xml'
-        'logback.xml')
-sha256sums=('e38ca7f218ac803522f27d60e5af5040342922144da305c7752c98719179b8ed'
-            '544b707a5e5d5d2f7694b6044f9bedc8a4bb7a783bc427d6c46bf7d3a22eaa1f'
-            '1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464'
-            '78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad'
-            '913c7995d51f305c36a81cda9cbce96c9481a04516ccc57024f33590e1c822ea')
-
-build() {
-  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk/jre/
-  ant create-jar
-}
+        'cryptomator.png'
+        'cryptomator-vault.xml')
+sha256sums=('6eeb34b4979d03102e7ec11e7d931f6cd7710a1627e64b362e59bd12609205fc'
+            '5f82b1846e5db21fcca2fb914321eecbc9906c8580ef4318d6a12c011e1e3285'
+            'fb1213c07d01c86757744507a151b37d4e917b69965a7db6d28bd99fcc735e6b'
+            '78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad')
+options=('!strip')
 
 package() {
-  install -d "${pkgdir}/usr/share/java/${pkgname}"
-  install -Dm644 "${srcdir}"/libs/*.jar "${pkgdir}/usr/share/java/${pkgname}"
-  install -Dm644 "${srcdir}/antbuild/Cryptomator-${pkgver}.jar" "${pkgdir}/usr/share/java/${pkgname}/cryptomator.jar"
-  install -Dm755 "${srcdir}/cryptomator.sh" "${pkgdir}/usr/bin/cryptomator"
-  install -Dm644 "${srcdir}/package/linux/Cryptomator.png" "${pkgdir}/usr/share/java/${pkgname}"
+  install -Dm755 "${srcdir}/cryptomator-${pkgver}-x86_64.AppImage" "${pkgdir}/opt/cryptomator/cryptomator-${pkgver}-x86_64.AppImage"
   install -Dm644 "${srcdir}/cryptomator-vault.xml" "${pkgdir}/usr/share/mime/packages/cryptomator-vault.xml"
   install -Dm644 "${srcdir}/cryptomator.desktop" "${pkgdir}/usr/share/applications/cryptomator.desktop"
-  install -Dm644 "${srcdir}/logback.xml" "${pkgdir}/etc/${pkgname}/logback.xml"
+  install -Dm644 "${srcdir}/cryptomator.png" "${pkgdir}/opt/cryptomator/cryptomator.png"
+  mkdir -p "${pkgdir}/usr/bin/"
+  ln -s "/opt/cryptomator/cryptomator-${pkgver}-x86_64.AppImage" "${pkgdir}/usr/bin/cryptomator"
 }
diff --git a/cryptomator.desktop b/cryptomator.desktop
index 088bdc6fd565..cc74bb5dbc14 100644
--- a/cryptomator.desktop
+++ b/cryptomator.desktop
@@ -2,7 +2,7 @@
 Name=Cryptomator
 Comment=Cloud Storage Encryption Utility
 Exec=/usr/bin/cryptomator
-Icon=/usr/share/java/cryptomator/Cryptomator.png
+Icon=/opt/cryptomator/cryptomator.png
 Terminal=false
 Type=Application
 Categories=Utility
diff --git a/cryptomator.png b/cryptomator.png
new file mode 100644
index 000000000000..1e0832c42af7
--- /dev/null
+++ b/cryptomator.png
diff --git a/cryptomator.sh b/cryptomator.sh
deleted file mode 100644
index 6a40a78d6a5f..000000000000
--- a/cryptomator.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export PATH="/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH"
-exec /usr/bin/java \
-  -Xmx512m \
-  -Dlogback.configurationFile=/etc/cryptomator/logback.xml \
-  -Dcryptomator.ipcPortPath=~/.Cryptomator/ipcPort.bin \
-  -Dcryptomator.settingsPath=~/.Cryptomator/settings.json \
-  -jar /usr/share/java/cryptomator/cryptomator.jar "$@"
diff --git a/logback.xml b/logback.xml
deleted file mode 100644
index 8107635a1525..000000000000
--- a/logback.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xml>
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %highlight([%-5level]) %cyan(%logger{36}) - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${user.home}/.Cryptomator/cryptomator.log</file>
-		<append>false</append>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${user.home}/.Cryptomator/cryptomator%i.log</fileNamePattern>
-			<minIndex>0</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="org.cryptomator.logging.LaunchBasedTriggeringPolicy" />
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="UPGRADE_FILE" class="ch.qos.logback.core.FileAppender">
-		<file>${user.home}/.Cryptomator/upgrade.log</file>
-		<append>true</append>
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.cryptomator" level="INFO" />
-	<logger name="org.eclipse.jetty.server.HttpChannel" level="INFO" />
-	<logger name="org.cryptomator.ui.model" level="INFO">
-		<appender-ref ref="UPGRADE_FILE" />
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-		<appender-ref ref="FILE" />
-	</root>
-
-</configuration>