Cleanup, update to v2.4.0

4 files changed, 28 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3131c5724d71..7144ef7e2608 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
 pkgbase = sync-my-l2p
-	pkgdesc = Sync the L2P of RWTH Aachen University
-	pkgver = 2.3.0
+	pkgdesc = Sync the L2P and moodle instance of RWTH Aachen University
+	pkgver = 2.4.0
 	pkgrel = 1
 	url = https://github.com/RobertKrajewski/Sync-my-L2P
 	arch = x86_64
 	license = LGPL3
-	depends = qt5-base
 	depends = hicolor-icon-theme
-	noextract = SyncMyL2P-$pkgver-linux.AppImage
-	noextract = sync-my-l2p.desktop.diff
+	depends = qt5-base
 	options = !strip
-	source = https://github.com/RobertKrajewski/Sync-my-L2P/releases/download/v2.3.0/SyncMyL2P-2.3.0-linux.AppImage
-	source = sync-my-l2p.desktop.diff
-	sha256sums = b1fb5fb354864a59be09837e4d44c6e213ec61fa41b0e6df4c3a7229fbccfd1a
-	sha256sums = 9fa15afce0c4c367341935f2ff1731b9cbac0e0a32df931356a15a3711f4a82d
+	source = https://github.com/RobertKrajewski/Sync-my-L2P/releases/download/v2.4.0/SyncMyL2P-2.4.0-linux.AppImage
+	sha256sums = 4cd7e7b75a1b6b3d186171553610ab3bf89633270ecafe6dbb19369109223ee2
 
 pkgname = sync-my-l2p
 
diff --git a/.gitignore b/.gitignore
index 8ade2b4bb14b..c14ab8a56d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-pkg/
-src/
-*.AppImage
-*.pkg.tar*
+/*.tar.xz
+/*.AppImage
+/pkg
+/src
diff --git a/PKGBUILD b/PKGBUILD
index 2e62b2c82ab6..a69922132ce4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,35 @@
-# Maintainer: Martin Kröning <m dot kroening at hotmail dot germantld>
+# Maintainer: Martin Kröning <m dot kroening at hotmail dot de>
 # Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
 pkgname=sync-my-l2p
-pkgver=2.3.0
+pkgver=2.4.0
 pkgrel=1
-pkgdesc="Sync the L2P of RWTH Aachen University"
+pkgdesc="Sync the L2P and moodle instance of RWTH Aachen University"
 arch=('x86_64')
 url="https://github.com/RobertKrajewski/Sync-my-L2P"
 license=('LGPL3')
-depends=('qt5-base' 'hicolor-icon-theme')
+depends=('hicolor-icon-theme' 'qt5-base')
 options=('!strip')
-source=("$url/releases/download/v$pkgver/SyncMyL2P-$pkgver-linux.AppImage"
-'sync-my-l2p.desktop.diff')
-noextract=('SyncMyL2P-$pkgver-linux.AppImage'
-'sync-my-l2p.desktop.diff')
-sha256sums=('b1fb5fb354864a59be09837e4d44c6e213ec61fa41b0e6df4c3a7229fbccfd1a'
-            '9fa15afce0c4c367341935f2ff1731b9cbac0e0a32df931356a15a3711f4a82d')
+source=("$url/releases/download/v$pkgver/SyncMyL2P-$pkgver-linux.AppImage")
+sha256sums=('4cd7e7b75a1b6b3d186171553610ab3bf89633270ecafe6dbb19369109223ee2')
 
 prepare() {
-	# Extract Appimage
+	# Extract binary, desktop entry and icons from the AppImage
 	chmod +x SyncMyL2P-$pkgver-linux.AppImage
-	./SyncMyL2P-$pkgver-linux.AppImage --appimage-extract &> /dev/null
-	
-	# Patch desktop file
-	patch squashfs-root/Sync-my-L2P.desktop sync-my-l2p.desktop.diff > /dev/null
+	for pattern in {usr/bin/Sync-my-L2P,Sync-my-L2P.desktop,hicolor}; do
+	  ./SyncMyL2P-$pkgver-linux.AppImage --appimage-extract $pattern > /dev/null
+	done
 }
 
 package() {
-	# Install desktop file
-	install -Dm755 squashfs-root/Sync-my-L2P.desktop "$pkgdir"/usr/share/applications/sync-my-l2p.desktop
+	cd squashfs-root
 
-	# Install icons
-	for size in 16 32 48 128; do
-		install -Dm755 squashfs-root/hicolor/${size}x${size}/apps/sync-my-L2P.png \
-			"$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/sync-my-l2p.png
-	done
+	# Binary
+	install -Dm755 usr/bin/Sync-my-L2P "$pkgdir"/usr/bin/Sync-my-L2P
+
+	# Desktop entry
+	install -Dm644 Sync-my-L2P.desktop "$pkgdir"/usr/share/applications/Sync-my-L2P.desktop
 
-	# Install bin
-	install -Dm755 squashfs-root/usr/bin/Sync-my-L2P "$pkgdir"/usr/bin/sync-my-l2p
+	# Icons
+	mkdir --parents "$pkgdir"/usr/share/icons && cp --recursive hicolor "$pkgdir"/usr/share/icons/
+	chmod --recursive 755 "$pkgdir"/usr/share/icons/hicolor
 }
diff --git a/sync-my-l2p.desktop.diff b/sync-my-l2p.desktop.diff
deleted file mode 100644
index 392aa6c76f34..000000000000
--- a/sync-my-l2p.desktop.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- Sync-my-L2P.desktop.orig	2018-02-07 10:43:25.590546451 +0100
-+++ Sync-my-L2P.desktop.new	2018-02-07 11:11:49.414476580 +0100
-@@ -2,8 +2,8 @@
- Name=Sync-my-L2P
- Comment=Sync-my-L2P — L2P synchronisation tool
- Comment[de]=Sync-my-L2P – Synchronsiert deine Dokumente aus dem L2P mit deinem Rechner
--Exec=Sync-my-L2P
--Icon=sync-my-L2P
-+Exec=sync-my-l2p
-+Icon=sync-my-l2p
- Terminal=false
- Type=Application
- Categories=Qt;FileTransfer;Network;