Upgrading to version 4.3

4 files changed, 15 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dbf8edb346a..9db2a28d82cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wallpaperdownloader
 	pkgdesc = Download, manage and change automatically your favorite wallpapers from the Internet
-	pkgver = 4.2
+	pkgver = 4.3
 	pkgrel = 1
 	url = https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader
 	arch = any
@@ -9,14 +9,8 @@ pkgbase = wallpaperdownloader
 	makedepends = maven
 	depends = java-runtime>=8
 	depends = xdg-utils
-	noextract = wallpaperdownloader-4.2.tar.gz
-	noextract = wallpaperdownloader.desktop
-	noextract = wallpaperdownloader.sh
-	source = wallpaperdownloader-4.2.tar.gz::https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader/get/v4.2.tar.gz
-	source = wallpaperdownloader.desktop
-	source = wallpaperdownloader.sh
-	sha256sums = 76e8d523f6127032d08f33167e9182ae52d5900d98c314a85c7f7aba73592a12
-	sha256sums = SKIP
-	sha256sums = SKIP
+	noextract = wallpaperdownloader-4.3.tar.gz
+	source = wallpaperdownloader-4.3.tar.gz::https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader/get/v4.3.tar.gz
+	sha256sums = 4537134f03eeb53ed5fbc2666dbf1f821cc445a905d5cf3626740b466f1c646e
 
 pkgname = wallpaperdownloader
diff --git a/PKGBUILD b/PKGBUILD
index aeede0a99b2a..f82982563b80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eloy Garcia Almaden <eloy.garcia.pca@gmail.com>
 # Contributor: gbr <gbr@protonmail.com>
 pkgname=wallpaperdownloader
-pkgver=4.2
+pkgver=4.3
 pkgrel=1
 pkgdesc='Download, manage and change automatically your favorite wallpapers from the Internet'
 arch=('any')
@@ -9,11 +9,9 @@ url='https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader'
 license=('GPL3')
 depends=('java-runtime>=8' 'xdg-utils')
 makedepends=('java-environment>=8' 'maven')
-source=("$pkgname-$pkgver.tar.gz::$url/get/v$pkgver.tar.gz"
-         wallpaperdownloader.{desktop,sh})
+source=("$pkgname-$pkgver.tar.gz::$url/get/v$pkgver.tar.gz")
 noextract=("${source[@]%%::*}")
-sha256sums=('76e8d523f6127032d08f33167e9182ae52d5900d98c314a85c7f7aba73592a12'
-            'SKIP' 'SKIP')
+sha256sums=('4537134f03eeb53ed5fbc2666dbf1f821cc445a905d5cf3626740b466f1c646e')
 
 prepare() {
     mkdir -p "$pkgname-$pkgver"
@@ -27,8 +25,14 @@ build() {
 
 package() {
     cd "$pkgname-$pkgver"
+
+    # Complete jar
     install -Dm644 "target/$pkgname.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
-    install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+    # Launching script 
+    install -Dm755 "aur/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+
+    # .desktop file and icon
+    install -Dm644 "aur/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
     install -Dm644 "aur/$pkgname.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
 }
diff --git a/wallpaperdownloader.desktop b/wallpaperdownloader.desktop
deleted file mode 100644
index 223c6627da41..000000000000
--- a/wallpaperdownloader.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=WallpaperDownloader
-GenericName=Wallpaper Downloader
-Comment=Download, manage and change your wallpapers automatically from the Internet
-Keywords=wallpaper;gallery;internet;download;downloader;changer;picture;desktop
-Exec=/usr/bin/wallpaperdownloader
-Icon=wallpaperdownloader
-Terminal=false
-Type=Application
-Categories=Utility;
\ No newline at end of file
diff --git a/wallpaperdownloader.sh b/wallpaperdownloader.sh
deleted file mode 100644
index 3679b1b0e0df..000000000000
--- a/wallpaperdownloader.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if /usr/bin/java -version 2>&1 | grep 'version "1.7' >/dev/null
-then
-	echo "WallpaperDownloader requires Java 8 or higher" >&2
-	exit 1
-fi
-
-# Memory usage is limited to 256 MBytes of RAM
-exec /usr/bin/java -Xmx256m -Xms128m -jar '/usr/share/java/wallpaperdownloader/wallpaperdownloader.jar' "$@"
\ No newline at end of file