switch to npm upstream; version 2019.1.18_2

3 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a7578c1c7be..bd12787e9005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = p3x-onenote
 	pkgdesc = Linux Electron Onenote - A Linux compatible version of OneNote
-	pkgver = 2019.1.18.1
+	pkgver = 2019.1.18_2
 	pkgrel = 1
-	url = https://github.com/patrikx3/onenote
+	url = https://www.npmjs.com/package/p3x-onenote
 	arch = any
 	license = MIT
 	makedepends = npm
 	depends = electron
-	source = git+https://github.com/patrikx3/onenote.git#tag=v2019.1.18-1
 	source = p3x-onenote.sh
 	source = p3x-onenote.desktop
-	md5sums = SKIP
 	md5sums = ef34fda1179a804e31b9684788e2ed25
 	md5sums = ff11d699c2aeac0caebf1a9d8533e664
 
diff --git a/PKGBUILD b/PKGBUILD
index 84e0d816213b..2df3353dd9a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,33 @@
 # Maintainer: Rocka <i at Rocka dot me>
 
 pkgname=p3x-onenote
-pkgver=2019.1.18.1
+pkgver=2019.1.18_2
 pkgrel=1
 pkgdesc="Linux Electron Onenote - A Linux compatible version of OneNote"
 arch=('any')
-url="https://github.com/patrikx3/onenote"
+url="https://www.npmjs.com/package/p3x-onenote"
 license=('MIT')
 depends=('electron')
 makedepends=('npm')
 
-source=("git+https://github.com/patrikx3/onenote.git#tag=v2019.1.18-1"
-        "p3x-onenote.sh"
-        "p3x-onenote.desktop"
-)
+source=("p3x-onenote.sh"
+        "p3x-onenote.desktop")
 
-md5sums=('SKIP'
-         'ef34fda1179a804e31b9684788e2ed25'
+md5sums=('114d06c6936b657ec68d373e5120d52f'
          'ff11d699c2aeac0caebf1a9d8533e664')
 
 build() {
-    cd "$srcdir/onenote"
-    npm_config_cache="$srcdir/npm_cache" npm install --production --ignore-scripts
+    cd "$srcdir"
+    npm_config_cache="$srcdir/npm_cache" npm install $pkgname@${pkgver//_/-} --production --ignore-scripts
 }
 
 package() {
     mkdir -p "$pkgdir/usr/lib/$pkgname"
-    cp -r "$srcdir/onenote/"{scripts,src,node_modules,package.json} "$pkgdir/usr/lib/$pkgname/"
+    cp -r "$srcdir/node_modules" "$pkgdir/usr/lib/$pkgname/"
 
     install -Dm755 "$srcdir/p3x-onenote.sh" "$pkgdir/usr/bin/p3x-onenote"
     install -Dm644 "$srcdir/p3x-onenote.desktop" -t "$pkgdir/usr/share/applications/"
-    install -Dm644 "$srcdir/onenote/src/electron/images/onenote-icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
-    install -Dm644 "$srcdir/onenote/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "$srcdir/node_modules/$pkgname/src/electron/images/onenote-icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+    install -Dm644 "$srcdir/node_modules/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/p3x-onenote.sh b/p3x-onenote.sh
index eecd002491a1..7ccf33dd242f 100644
--- a/p3x-onenote.sh
+++ b/p3x-onenote.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/bash
-exec /usr/bin/electron /usr/lib/p3x-onenote
+exec /usr/bin/electron /usr/lib/p3x-onenote/node_modules/p3x-onenote