makedeb


tutanota-desktop-bin 220.240411.0-0


Official Tutanota email client

Click here to go back to the commit logs for tutanota-desktop-bin.

Commit:


Hash: bf7526c286fa9aebde3395329e97fc2efe5e5a8b

Message: don't use AppRun, not running in AppImage environment

Diff


diff --git a/.SRCINFO b/.SRCINFO
index bbcf561..e4b0541 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tutanota-desktop-bin
 	pkgdesc = Official Tutanota email client
 	pkgver = 3.67.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://tutanota.com
 	arch = x86_64
 	license = GPL3
@@ -11,9 +11,6 @@ pkgbase = tutanota-desktop-bin
 	depends = libxtst
 	depends = libappindicator-gtk3
 	depends = libnotify
-	optdepends = zenity: for dialogs
-	optdepends = kdialog: for dialogs
-	optdepends = xdialog: for dialogs
 	provides = tutanota-desktop
 	conflicts = tutanota-desktop
 	conflicts = tutanota-desktop-linux
@@ -25,7 +22,7 @@ pkgbase = tutanota-desktop-bin
 	sha512sums = f5b34e7a2f9fd64a98a3f783cb7a90cdb3e9212860e1580a96a14ea94ccbfe38e0463197dd68b024b6b6512c59dcfd2bb638a5d73444ae5d3f0726bf005ee0ff
 	sha512sums = 31d246e038730c9b56e8d4877b5600f450ba3fb5680112b8701de9f08b0cadaf957d0d3d2a4ad6de1a56705ef75acfeb95885404bc4516ac604bdd08220d12c4
 	sha512sums = 7c6cf9f1074c08b4d38567ced95159c0809af025efe01b0163d9bb5107daabfa873064255186c071a7dc3a9177ccd0c1b2fcc8b085bdbff234965a6710b3ae45
-	sha512sums = 3e6089fae24cfb0bfb210e180427b525730f84b3cb64b5c57fe78e08fcb4292fcd60d15fba93bf9e7ef5c1692170de79cad23236e748308e4372266329140389
+	sha512sums = 373e1be50297177306ba2f6898fbb57e12b8360af5fb575b2711179e0e952b8e4e9de1d4a66675e441fbe7f8dd5c63d3bddf9114f6e3be95adb49703e597137f
 
 pkgname = tutanota-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index e8a79f1..527f2f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,13 @@
 # Co-Maintainer: Aaron J. Graves <linux@ajgraves.com>
 pkgname=tutanota-desktop-bin
 pkgver=3.67.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Official Tutanota email client"
 arch=('x86_64')
 url="https://tutanota.com"
 license=('GPL3')
 depends=('nss' 'libxss' 'libxtst' 'libappindicator-gtk3' 'libnotify')
 makedepends=('asar')
-optdepends=('zenity: for dialogs'
-            'kdialog: for dialogs'
-            'xdialog: for dialogs')
 source=("${pkgname%-bin}-$pkgver.AppImage::https://mail.tutanota.com/desktop/${pkgname%-bin}-linux.AppImage"
         "linux-sig-$pkgver.bin::https://mail.tutanota.com/desktop/linux-sig.bin"
         'https://raw.githubusercontent.com/tutao/tutanota/master/tutao-pub.pem'
@@ -22,7 +19,7 @@ replaces=("${pkgname%-bin}-linux")
 sha512sums=('f5b34e7a2f9fd64a98a3f783cb7a90cdb3e9212860e1580a96a14ea94ccbfe38e0463197dd68b024b6b6512c59dcfd2bb638a5d73444ae5d3f0726bf005ee0ff'
             '31d246e038730c9b56e8d4877b5600f450ba3fb5680112b8701de9f08b0cadaf957d0d3d2a4ad6de1a56705ef75acfeb95885404bc4516ac604bdd08220d12c4'
             '7c6cf9f1074c08b4d38567ced95159c0809af025efe01b0163d9bb5107daabfa873064255186c071a7dc3a9177ccd0c1b2fcc8b085bdbff234965a6710b3ae45'
-            '3e6089fae24cfb0bfb210e180427b525730f84b3cb64b5c57fe78e08fcb4292fcd60d15fba93bf9e7ef5c1692170de79cad23236e748308e4372266329140389')
+            '373e1be50297177306ba2f6898fbb57e12b8360af5fb575b2711179e0e952b8e4e9de1d4a66675e441fbe7f8dd5c63d3bddf9114f6e3be95adb49703e597137f')
 
 prepare() {
 	# Validate the signature against public key: https://tutanota.com/howto/#verify-desktop
@@ -34,16 +31,12 @@ prepare() {
 	chmod +x "${pkgname%-bin}-$pkgver.AppImage"
 	./"${pkgname%-bin}-$pkgver.AppImage" --appimage-extract
 
-	sed -i 's|Exec=AppRun|Exec=/opt/tutanota-desktop/AppRun|g' \
-		"squashfs-root/${pkgname%-bin}.desktop"
-
 	# Disable auto-update
 	cd "$srcdir/squashfs-root/resources"
 	mkdir -p app-asar
 	asar extract app.asar app-asar
 	rm app.asar
-	sed -i 's|"enableAutoUpdate": true|"enableAutoUpdate": false|g' \
-		app-asar/package.json
+	sed -i 's|"enableAutoUpdate": true|"enableAutoUpdate": false|g' app-asar/package.json
 	asar pack app-asar app.asar
 	rm -rf app-asar
 }
@@ -54,7 +47,7 @@ package() {
 	install -d "$pkgdir/opt/${pkgname%-bin}"
 	cp -r squashfs-root/* "$pkgdir/opt/${pkgname%-bin}"
 	rm -rf "$pkgdir/opt/${pkgname%-bin}/usr"
-	rm "$pkgdir/opt/${pkgname%-bin}/${pkgname%-bin}.desktop"
+	rm "$pkgdir/opt/${pkgname%-bin}"/{"${pkgname%-bin}".desktop,AppRun}
 
 	# Fix permisssions
 	chmod 644 "$pkgdir/opt/${pkgname%-bin}"/resources/app{.asar,-update.yml}
diff --git a/tutanota-desktop b/tutanota-desktop
index 3576d4a..d424404 100644
--- a/tutanota-desktop
+++ b/tutanota-desktop
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-/opt/tutanota-desktop/AppRun
+/opt/tutanota-desktop/tutanota-desktop