peerflix-server: 0.3.1

4 files changed, 19 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02711f445569..af123c60b2c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Jun 24 13:07:41 UTC 2017
 pkgbase = peerflix-server
 	pkgdesc = Streaming torrent client for node.js with web ui
-	pkgver = 0.2.0
+	pkgver = 0.3.1
 	pkgrel = 1
 	url = https://github.com/asapach/peerflix-server
 	arch = i686
@@ -14,12 +12,10 @@ pkgbase = peerflix-server
 	depends = nodejs
 	conflicts = peerflix-server-git
 	options = !strip
-	source = https://github.com/asapach/peerflix-server/archive/v0.2.0.tar.gz
 	source = peerflix-server.sh
 	source = peerflix-server.service
-	md5sums = f4c27f1c360423f5ad569e62e01482bb
-	md5sums = ee5ad551f86380d0a353b5220ab58159
-	md5sums = f22faa77f2d6049eee5d1a91140a25cc
+	md5sums = ea9702820f92bef0636a4f01d13dd348
+	md5sums = 8eb4184190cd66435c3bda2435982422
 
 pkgname = peerflix-server
 
diff --git a/PKGBUILD b/PKGBUILD
index da19b63c4626..c7b15e91a3bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: robertfoster
 
 pkgname=peerflix-server
-pkgver=0.2.0
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="Streaming torrent client for node.js with web ui"
 arch=('i686' 'x86_64')
@@ -9,28 +9,21 @@ url="https://github.com/asapach/peerflix-server"
 license=('MIT')
 depends=('nodejs')
 makedepends=('nodejs-grunt-cli' 'bower' 'npm')
-source=(https://github.com/asapach/peerflix-server/archive/v${pkgver}.tar.gz
-	peerflix-server.sh
-	peerflix-server.service)
+source=(peerflix-server.sh
+peerflix-server.service)
 conflicts=('peerflix-server-git')
 options=('!strip')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  npm install
-  bower install
-  grunt build
-}
-
 package(){
-  cd $srcdir/$pkgname-$pkgver
+    cd $srcdir
+    local _npmdir="$pkgdir/usr/lib/node_modules/"
+    mkdir -p $_npmdir
+    cd $_npmdir
+    npm install -g --prefix "$pkgdir/usr" --ignore-scripts --production peerflix-server@$pkgver
 
-  mkdir -p $pkgdir/opt/peerflix-server
-  cp -r dist server node_modules LICENSE $pkgdir/opt/peerflix-server/
-  install -Dm644 "${srcdir}/peerflix-server.service" "${pkgdir}/usr/lib/systemd/system/peerflix-server.service"
-  install -Dm775 "${srcdir}/peerflix-server.sh" "${pkgdir}/usr/bin/peerflix-server"
-} 
+    install -Dm644 "${srcdir}/peerflix-server.service" "${pkgdir}/usr/lib/systemd/system/peerflix-server.service"
+    install -Dm775 "${srcdir}/peerflix-server.sh" "${pkgdir}/usr/bin/peerflix-server"
+}
 
-md5sums=('f4c27f1c360423f5ad569e62e01482bb'
-         'ee5ad551f86380d0a353b5220ab58159'
-         'f22faa77f2d6049eee5d1a91140a25cc')
+md5sums=('ea9702820f92bef0636a4f01d13dd348'
+'8eb4184190cd66435c3bda2435982422')
diff --git a/peerflix-server.service b/peerflix-server.service
index f7452b2cf536..c5268ab6330d 100644
--- a/peerflix-server.service
+++ b/peerflix-server.service
@@ -4,7 +4,7 @@ Description=Peerflix Server
 [Service]
 Type=forking
 User=root
-WorkingDirectory=/opt/peerflix-server/
+WorkingDirectory=/usr/lib/node_modules/peerflix-server/
 ExecStart=/usr/bin/peerflix-server
 
 [Install]
diff --git a/peerflix-server.sh b/peerflix-server.sh
index 864e29edbb4b..d2f1d437dce2 100644
--- a/peerflix-server.sh
+++ b/peerflix-server.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/sh
-cd /opt/peerflix-server
-node server/bin.js &
+cd /usr/lib/node_modules/peerflix-server/server
+node bin.js &