Added npm5 fix and updates

3 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a6a6a8af6f5..013239758888 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Mar 12 09:00:05 UTC 2016
+# Sat Dec 23 18:57:15 UTC 2017
 pkgbase = haste-server-git
 	pkgdesc = Prettiest, easiest to use pastebin ever made
-	pkgver = r246.6835eef
+	pkgver = r298.8da37ea
 	pkgrel = 1
 	url = https://github.com/seejohnrun/haste-server
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 82d12cbcdce0..6523d91438fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=haste-server-git
 _gitname=haste-server
-pkgver=r259.eb5c8ee
+pkgver=r298.8da37ea
 pkgrel=1
 pkgdesc="Prettiest, easiest to use pastebin ever made"
 arch=('any')
@@ -24,9 +24,6 @@ pkgver() {
 prepare() {
   cd "${srcdir}/${_gitname}"
 
-  # Set the current working directory
-  sed -i '1i process.chdir(__dirname)' server.js
-
   # Adding missing files to package.json
   sed -i '42i "config.js","about.md",' package.json
 
@@ -34,14 +31,17 @@ prepare() {
   sed -i '36,40c "path": "./data","type": "file"' config.js
 
   # Unable to run haste from /usr/bin, so removing it
-  sed -i '37,39d' package.json
+  sed -i '36,38d' package.json
+
+  # Fix error with npm5 issue
+  npm pack
 }
 
 package() {
   cd "${srcdir}/${_gitname}"
 
   install -Dm644 "../../${_gitname}.service" -t "${pkgdir}/usr/lib/systemd/system"
-  npm install --cache ../cache --user root -g --prefix "${pkgdir}/usr"
+  npm install --cache ../cache --user root -g --prefix "${pkgdir}/usr" *.tgz
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/haste-server.service b/haste-server.service
index 5d165a6aca29..3b8c443e87a4 100644
--- a/haste-server.service
+++ b/haste-server.service
@@ -4,6 +4,7 @@ Requires=network.target
 After=network.target
 
 [Service]
+WorkingDirectory=/usr/lib/node_modules/haste
 ExecStart=/usr/bin/node /usr/lib/node_modules/haste/server.js
 PrivateTmp=true