username change

2 files changed, 46 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c49246ea824..127ce455ff0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = meridius-bin-git
 	pkgdesc = Free and modern music player for VK. Meridius - it is a beautiful music player for vk.com
 	pkgver = v2.4.24
 	pkgrel = 1
-	url = https://purplehorrorrus.github.io/meridius
+	url = https://github.com/PurpleHorrorRus/Meridius/releases/download/v2.4.24/meridius-2.4.24.tar.gz
 	arch = x86_64
 	license = custom
 	makedepends = git
@@ -29,3 +29,15 @@ pkgname = meridius-bin-git
 	optdepends = libappindicator-gtk3
 	provides = meridius
 	conflicts = meridius
+
+pkgname = meridius-bin-git-electron
+	pkgdesc = Music Player for vk.com based on Electron, NuxtJS, Vue. (System Electron)
+	arch = x86_64
+	depends = electron
+	depends = libxss
+	depends = libxtst
+	depends = at-spi2-core
+	depends = util-linux-libs
+	depends = libsecret
+	provides = meridius
+	conflicts = meridius
diff --git a/PKGBUILD b/PKGBUILD
index 8c5cd50fe0a0..f00f6994be45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Contributor: ANDRoid7890 <andrey.android7890 at gmail dot com>
+# Contributor: parov0z <andrey.android7890 at gmail dot com>
 
 pkgbase=meridius-bin-git
-pkgname=("${pkgbase}") #"${pkgbase}-electron")
+pkgname=("${pkgbase}" "${pkgbase}-electron")
 pkgver=v2.4.24
 pkgrel=1
 pkgdesc="Free and modern music player for VK. Meridius - it is a beautiful music player for vk.com"
@@ -16,15 +16,14 @@ md5sums=('SKIP')
 pkgver(){
     cd "Meridius"
     git tag --sort=committerdate | tail -1
-}         
+}  
+
+file=meridius-${pkgver//v}.tar.gz
+url=https://github.com/PurpleHorrorRus/Meridius/releases/download/$pkgver/$file
          
 build(){
     cd $srcdir
-    file=meridius-${pkgver//v}.tar.gz
-    url=https://github.com/PurpleHorrorRus/Meridius/releases/download/$pkgver/$file
-    
     curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o $file $url
-    bsdtar -xf $file
 }
     
 package_meridius-bin-git(){
@@ -34,38 +33,42 @@ package_meridius-bin-git(){
     pkgdesc="Music Player for vk.com based on Electron, NuxtJS, Vue. (Built-in Electron)"
     provides=('meridius')
     conflicts=('meridius')
+        bsdtar -xf $file
+    
         install -dm755 "$pkgdir/opt"
         mv "meridius-${pkgver//v}" "${pkgdir}/opt/Meridius"
         install -Dm 644 "${pkgdir}/opt/Meridius/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
         
-        gendesk --pkgname "meridius"                            \
+        gendesk -f --pkgname "meridius"                         \
                 --exec "/opt/Meridius/meridiusreborn %U"        \
                 --icon "/opt/Meridius/build/icons/256x256.png"  \
-                --categories "Audio;"                           \
+                --categories "Audio;Music;Player;AudioVideo;"   \
                 --comment $pkgdesc
                 
         install -Dm 644 -t "$pkgdir/usr/share/applications" meridius.desktop
 }
 
 # (not working)
-# https://aur.archlinux.org/packages/meridius-electron-bin/
-# package_meridius-bin-git-electron() {
-#     depends=('electron' 'libxss' 'libxtst' 'at-spi2-core' 'util-linux-libs' 'libsecret')
-#     arch=('x86_64')
-#     pkgdesc="Music Player for vk.com based on Electron, NuxtJS, Vue. (System Electron)"
-#     provides=('meridius')
-#     conflicts=('meridius')
-#     
-#         mkdir -p ${pkgdir}/usr/share/Meridius
-#         mkdir -p ${pkgdir}/usr/share/icons/hicolor/256x256/apps
-#         mkdir -p ${pkgdir}/usr/share/applications
-# 
-#         bsdtar -xvf data.tar.xz ./opt/Meridius/resources/app.asar ./usr/share/applications/meridiusreborn.desktop ./usr/share/icons/hicolor/256x256/apps/meridiusreborn.png
-# 
-#         sed -i 's!/opt/Meridius/meridiusreborn!electron /usr/share/Meridius/app.asar!' usr/share/applications/meridiusreborn.desktop
-#         sed -i 's!Audio;!Audio;Music;Player;AudioVideo;!' usr/share/applications/meridiusreborn.desktop
-# 
-#         mv usr/share/icons/hicolor/256x256/apps/meridiusreborn.png ${pkgdir}/usr/share/icons/hicolor/256x256/apps
-#         mv usr/share/applications/meridiusreborn.desktop ${pkgdir}/usr/share/applications
-#         mv opt/Meridius/resources/app.asar ${pkgdir}/usr/share/Meridius
-# }
+package_meridius-bin-git-electron() {
+    depends=('electron' 'libxss' 'libxtst' 'at-spi2-core' 'util-linux-libs' 'libsecret')
+    arch=('x86_64')
+    pkgdesc="Music Player for vk.com based on Electron, NuxtJS, Vue. (System Electron)"
+    provides=('meridius')
+    conflicts=('meridius')
+        bsdtar -xf $file "./meridius-${pkgver//v}/build/icons/256x256.png" "./meridius-${pkgver//v}/resources/app.asar"
+    
+        mkdir -p ${pkgdir}/usr/share/Meridius
+        mkdir -p ${pkgdir}/usr/share/icons/hicolor/256x256/apps
+        mkdir -p ${pkgdir}/usr/share/applications
+
+        gendesk -f --pkgname "meridius"                             \
+                --exec "electron /usr/share/Meridius/app.asar %U"   \
+                --icon "meridiusreborn"                             \
+                --categories "Audio;"                               \
+                --comment $pkgdesc
+        
+        
+        mv "meridius-${pkgver//v}/build/icons/256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/meridiusreborn.png"
+        mv meridius.desktop "${pkgdir}/usr/share/applications"
+        mv "meridius-${pkgver//v}/resources/app.asar" "${pkgdir}/usr/share/Meridius"
+}