Install prebuilt directly

Signed-off-by: Ovenoboyo <ovenoboyo@gmail.com>

3 files changed, 17 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cab56cde5be5..423bf939df97 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = moosync
+pkgbase = moosync-bin
 	pkgdesc = A simple music player
 	pkgver = 7.1.0
 	pkgrel = 1
@@ -12,15 +12,12 @@ pkgbase = moosync
 	depends = libvips
 	depends = alsa-lib
 	provides = moosync
+	conflicts = moosync
 	source = moosync-7.1.0-prebuilt.tar::https://github.com/Moosync/Moosync/releases/download/v7.1.0/Moosync-7.1.0-linux-x64.pacman
-	source = moosync-7.1.0.tar::https://github.com/Moosync/Moosync/archive/v7.1.0.tar.gz
 	source = moosync
 	source = moosync.desktop
-	source = builder-args.sh
 	sha256sums = 943b5abc7c2bb70ba8a536802c55dd557d9ccbfaf54dfd3681076ac5550ed76b
-	sha256sums = 708af19411fc03d18dbd4446d1c099eed80873144238531a45c6cb2d21712b4b
-	sha256sums = 36867efee6f9a491e64979ed329ce87f2136da2afcce4c9ef5696a9f2538d9ba
+	sha256sums = 4ed86e1f5a969e6c03fe8efb66ec136c2f37b21010a37eacd414675b784b1058
 	sha256sums = 4b63fa17717239db8a87ebeae1fdd96c5318b71d7d851d6c5a4f337793d3fecd
-	sha256sums = bb106abfddfa388cdd9953b034e3176f87eac636932d793b2f5293576cc017bb
 
-pkgname = moosync
+pkgname = moosync-bin
diff --git a/PKGBUILD b/PKGBUILD
index 209acec6ba3f..6a697b0fdb4a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,29 @@
 # Maintainer: Sahil Gupte <ovenoboyo@gmail.com>
 
-pkgname=moosync
+_pkgname=moosync
+pkgname=moosync-bin
 pkgver=7.1.0
 pkgrel=1
 pkgdesc='A simple music player'
 arch=('any')
 url='https://github.com/Moosync/Moosync'
 license=('GPL3')
-provides=("${pkgname}")
+provides=("${_pkgname}")
 depends=('electron' 'libvips' 'alsa-lib')
 makedepends=('yarn' 'node-gyp' 'cargo')
-source=("${pkgname}-${pkgver}-prebuilt.tar::https://github.com/Moosync/Moosync/releases/download/v${pkgver}/Moosync-${pkgver}-linux-x64.pacman" "${pkgname}-${pkgver}.tar::https://github.com/Moosync/Moosync/archive/v${pkgver}.tar.gz" moosync moosync.desktop builder-args.sh)
+source=("${_pkgname}-${pkgver}-prebuilt.tar::https://github.com/Moosync/Moosync/releases/download/v${pkgver}/Moosync-${pkgver}-linux-x64.pacman" moosync moosync.desktop)
 sha256sums=('943b5abc7c2bb70ba8a536802c55dd557d9ccbfaf54dfd3681076ac5550ed76b'
-            '708af19411fc03d18dbd4446d1c099eed80873144238531a45c6cb2d21712b4b'
-            '36867efee6f9a491e64979ed329ce87f2136da2afcce4c9ef5696a9f2538d9ba'
-            '4b63fa17717239db8a87ebeae1fdd96c5318b71d7d851d6c5a4f337793d3fecd'
-            'bb106abfddfa388cdd9953b034e3176f87eac636932d793b2f5293576cc017bb')
+            '4ed86e1f5a969e6c03fe8efb66ec136c2f37b21010a37eacd414675b784b1058'
+            '4b63fa17717239db8a87ebeae1fdd96c5318b71d7d851d6c5a4f337793d3fecd')
+conflicts=("${_pkgname}")
 _sourcedirectory="Moosync-$pkgver"
 
-build() {
-    cd "$srcdir/$_sourcedirectory/"
+package() {    
+    install -d opt "${pkgdir}/opt"
+    install -d usr "${pkgdir}/usr"
 
-    # Remove electron from package.json
-    sed -E -i 's|("electron": ").*"|\1'"$(cat "/usr/lib/electron/version")"'"|' 'package.json'
-
-    # Remove postinstall from package.json
-    sed -i -e 's/\"postinstall\":.*/\"postinstall\": \"patch-package\",/' package.json
-
-    yarn install --ignore-engines || true
-
-    . "$srcdir/builder-args.sh"
-    yarn electron:build -- $ELECTRON_BUILDER_ARCH_ARGS --linux --dir 
-}
-
-package() {
-    install -d "${pkgdir}/opt/Moosync/"
-
-    # Move compiled app to pkgdir
-    mv ${srcdir}/${_sourcedirectory}/dist_electron/linux*unpacked/* "${pkgdir}/opt/Moosync/"
-
-    ls "${pkgdir}/opt/Moosync/"
-
-    rm -f "${pkgdir}/opt/Moosync/resources/app.asar"
-    cp "${srcdir}/opt/Moosync/resources/app.asar" "${pkgdir}/opt/Moosync/resources/"
-
-    # Install icons
-    for _size in 16 32 48 256 512; do
-		install -Dm644 "${srcdir}/${_sourcedirectory}/build/icons/${_size}x${_size}.png" "$pkgdir/usr/share/icons/hicolor/${_size}x${_size}/apps/moosync.png"
-	done
+    find opt -type f -exec install -Dm 755 "{}" "${pkgdir}/{}" \;
+    find usr -type f -exec install -Dm 755 "{}" "${pkgdir}/{}" \;
 
     install -d "${pkgdir}/usr/bin"
     install "moosync" "${pkgdir}/usr/bin/moosync"
diff --git a/moosync b/moosync
index 31187ea8ea86..ba1cd0f505ae 100755
--- a/moosync
+++ b/moosync
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron /opt/Moosync/resources/app.asar "$@"
+exec /opt/Moosync/moosync "$@"