Netlify 1.0.6-2

2 files changed, 24 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c249e574bf13..ebfb2a9f18c5 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = netlify-application
 	pkgdesc = Unofficial Netlify desktop application
 	pkgver = 1.0.6
-	pkgrel = 1
-	url = https://gitlab.com/netlify-desktop/application
+	pkgrel = 2
 	arch = any
 	license = GPL
-	makedepends = npm
-	makedepends = git
-	makedepends = unzip
+	depends = libelectron
 	depends = nss
 	depends = gtk3
 	depends = libxss
-	provides = netlify-application
-	conflicts = netlify-application
+	depends = git
 	source = git+https://gitlab.com/netlify-desktop/application
 	sha256sums = SKIP
 
 pkgname = netlify-application
-
diff --git a/PKGBUILD b/PKGBUILD
index cf7b51f11f2e..b0887f31f8d6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,38 @@
 pkgname=netlify-application
 _pkgname=Netlify
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Unofficial Netlify desktop application"
 arch=('any')
-url="https://gitlab.com/netlify-desktop/application"
 license=('GPL')
-depends=('nss' 'gtk3' 'libxss')
-makedepends=('npm' 'git' 'unzip')
-provides=("${pkgname%}")
-conflicts=("${pkgname%}")
-source=('git+https://gitlab.com/netlify-desktop/application')
+depends=('libelectron' 'nss' 'gtk3' 'libxss' 'git')
+source=("git+https://gitlab.com/netlify-desktop/application")
 sha256sums=('SKIP')
 
-pkgver() {
-    cd "$srcdir/application"
-    node -pe "require('./package.json').version"
-}
 
-build() {
+package() {
     cd "$srcdir/application"
-    npm --cache "$srcdir/npm-cache" i electron@13.1.6 electron-context-menu@3.1.1 electron-packager
-    ./node_modules/.bin/electron-packager .
-    for dir in $_pkgname-linux-*/ ; do mv "${dir}" "$_pkgname" ;done
-    rm -rf "$srcdir/$pkgname/$_pkgname/resources/app/node_modules"
-}
+    rm -rf .git
+    cat <<EOT >> Netlify
+    #!/bin/bash
+    cd /opt/Netlify &&
+    npm start
+EOT
+
+    chmod +x netlify
+    ln -s "/opt/libelectron/node_modules" "$srcdir/application"
+    install -dm755 "$pkgdir/opt/netlify"
+    install -dm755 "$pkgdir/usr/share/pixmaps"    
+    cp -r ./ "$pkgdir/opt/DisneyPlus"
+    cp -r "$pkgdir/opt/DisneyPlus/Netlify.svg" "$pkgdir/usr/share/pixmaps"  
 
-package() {
-    cd "$srcdir/application/$_pkgname"
-    install -dm755 "$pkgdir/opt/$_pkgname"
-    cp -r ./ "$pkgdir/opt/$_pkgname"
 
     # Link to binary
     install -dm755 "$pkgdir/usr/bin"
-    ln -s "/opt/$_pkgname/$_pkgname" "$pkgdir/usr/bin/${pkgname%}"
+    ln -s "/opt/DisneyPlus/netlify" "$pkgdir/usr/bin/Netlify"
 
     # Desktop Entry
-    install -Dm644 "$srcdir/application/$_pkgname.desktop" \
-        "$pkgdir/usr/share/applications/$_pkgname.desktop"
-    sed -i s%/usr/share%/opt% "$pkgdir/usr/share/applications/$_pkgname.desktop"
+    install -Dm644 "$srcdir/application/DisneyPlus.desktop" \
+        "$pkgdir/usr/share/applications/DisneyPlus.desktop"
+    sed -i s%/usr/share%/opt% "$pkgdir/usr/share/applications/DisneyPlus.desktop"
 }