v.2.1.5

2 files changed, 14 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2cc36ba3b18..3b59f9c6d638 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,13 +2,13 @@
 # Mon Aug 28 06:27:32 UTC 2017
 pkgbase = listen1
 	pkgdesc = One for all free music in China
-	pkgver = 2.1.2
+	pkgver = 2.1.5
 	pkgrel = 1
 	url = https://listen1.github.io/listen1/
 	arch = x86_64
 	license = MIT
-	source = https://github.com/listen1/listen1_desktop/releases/download/v2.1.2/Listen1_2.1.2_linux_x86_64.AppImage
-	md5sums = 7cbbb75566c3e6105a1622d53bf33943d53a22cedcb30c3c4895e29b731728e1
+	source = https://github.com/listen1/listen1_desktop/releases/download/v2.1.5/Listen1_2.1.5_linux_x86_64.AppImage
+	md5sums = 833166dfaac778e113223d2c8ffad0e30e02cc845d2a92db3a0449f983643ad2
 
 pkgname = listen1
 
diff --git a/PKGBUILD b/PKGBUILD
index 0bc63f965352..ceddb0efa5cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,28 @@
 # Maintainer: avisy <994931954@qq.com>
-# Maintainer: visitant0226 <visitant0226@gmail.com>
-# Maintainer: super13 <fangguikai@163.com>
+
 pkgname=listen1
-pkgver=2.1.2
+pkgver=2.1.5
 pkgrel=1
 pkgdesc="One for all free music in China"
 arch=('x86_64')
-makedepends=('p7zip')
 url="https://listen1.github.io/listen1/"
 license=('MIT')
-_filename='Listen1_2.1.2_linux_x86_64.AppImage'
-noextract=("$_filename")
-options=('!strip')
+noextract=("Listen1_${pkgver}_linux_x86_64.AppImage")
+options=("!strip")
 source=("https://github.com/listen1/listen1_desktop/releases/download/v${pkgver}/Listen1_${pkgver}_linux_x86_64.AppImage" 
 "https://raw.githubusercontent.com/listen1/listen1/master/listen1/res/icon.png")
-sha256sums=('7cbbb75566c3e6105a1622d53bf33943d53a22cedcb30c3c4895e29b731728e1'
+sha256sums=('833166dfaac778e113223d2c8ffad0e30e02cc845d2a92db3a0449f983643ad2'
 '6cabb778a29488ab33bb320b63e40a59f680707b475e58f5ffe7d72cf9788834')
 
 
-prepare() {
+package() {
     cd "${srcdir}"
-    mv "$_filename" "listen1.AppImage"
+    mv "Listen1_${pkgver}_linux_x86_64.AppImage" "listen1.AppImage"
     mv "icon.png" "listen1.png"
     7z x "${srcdir}/listen1.AppImage" listen1.desktop
-    sed -i 's/AppRun/\/opt\/appimages\/listen1.AppImage/' listen1.desktop
-    mkdir -p usr/share/pixmaps usr/share/applications opt/appimages
-    cp listen1.png usr/share/pixmaps
-    mv listen1.desktop usr/share/applications
-    cp listen1.AppImage opt/appimages/
+    sed -i 's/AppRun/env DESKTOPINTEGRATION=no "\/opt\/appimages\/listen1.AppImage" %U/' listen1.desktop
+    install -Dm755 "listen1.AppImage" "${pkgdir}/opt/appimages/listen1.AppImage"
+    install -Dm644 "listen1.desktop" "${pkgdir}/usr/share/applications/listen1.desktop"
+    install -Dm644 "listen1.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/listen1.png"
 }
 
-package() {
-    cd "${srcdir}"
-    cp -rp usr "${pkgdir}/usr"
-    cp -rp opt "${pkgdir}/opt"
-    chmod +x "${pkgdir}/opt/appimages/listen1.AppImage"
-}