more update

4 files changed, 20 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6527ab2e39f..b407803715cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug  7 05:44:58 UTC 2017
+# Mon Aug  7 06:55:45 UTC 2017
 pkgbase = nfsen
 	pkgdesc = Netflow visualisation and investigation tool
 	pkgver = 1.3.8
-	pkgrel = 5
+	pkgrel = 6
 	url = https://sourceforge.net/projects/nfsen
 	install = install
 	arch = i686
@@ -28,9 +28,9 @@ pkgbase = nfsen
 	source = service
 	source = tmpfiles
 	md5sums = fc45b3f44a66c2ed65d1269e479c2414
-	md5sums = fa81120f06b2dbcfc97c73c06b0718f6
+	md5sums = 19baa378b5251305d5b6b209f90f81f2
 	md5sums = e8ffd8c767aca866050d679b609a0db9
-	md5sums = e3ed23c170911bd25d5a5e61de512675
+	md5sums = ad1b4a004dacd0508033fcfca763a2fe
 	md5sums = 69898397995d35b1d53d6a61b16b24a8
 	md5sums = d60d7334fb00e85ea3230f059ae660aa
 
diff --git a/PKGBUILD b/PKGBUILD
index 7a7b74cbe9e0..036d9e49822e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=nfsen
 pkgver=1.3.8
-pkgrel=5
+pkgrel=6
 pkgdesc="Netflow visualisation and investigation tool"
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/nfsen"
@@ -25,29 +25,14 @@ install='install'
 
 prepare() {
 	cd "$pkgname-$pkgver"
-        sed -i 's|%%PERL%%|/usr/bin/perl|' bin/* libexec/* plugins/backend/*.pm plugins/*.pm
-        sed -i 's|%%LIBEXECDIR%%|/opt/nfsen/libexec|' bin/* plugins/backend/*.pm plugins/*.pm
-        sed -i 's|%%CONFDIR%%|/etc|' libexec/*
+        # Fix error
+        sed -i 's|$rrd_version < 1.6|$rrd_version < 1.7|' libexec/NfSenRRD.pm
 }
 
 package() {
+	install -dm755 "$pkgdir/usr/share/webapps" 
+        cp -a "$pkgname-$pkgver" "$pkgdir/usr/share/webapps/"
 	cd "$pkgname-$pkgver"
-
-        install -d "$pkgdir/opt/$pkgname/plugins"
-        install -d "$pkgdir/usr/share/webapps/$pkgname/plugins"
-        install -d "$pkgdir/var/lib/nfsen/filters"
-        install -d "$pkgdir/var/lib/nfsen/fmt"
-        install -d "$pkgdir/var/lib/nfsen/profiles-stat"
-        install -d "$pkgdir/var/lib/nfsen/profiles-data"
-        cp -a bin "$pkgdir/opt/$pkgname"
-        cp -a libexec "$pkgdir/opt/$pkgname"
-        cp -a plugins/backend/* "$pkgdir/opt/$pkgname/plugins"
-        cp -a contrib/PortTracker/PortTracker.pm "$pkgdir/opt/$pkgname/plugins"
-        cp -a plugins/PluginTemplate.pm "$pkgdir/opt/$pkgname/plugins"
-        cp -a plugins/frontend/* "$pkgdir/usr/share/webapps/$pkgname/plugins"
-        cp -a contrib/PortTracker/PortTracker.php "$pkgdir/usr/share/webapps/$pkgname/plugins"
-        cp -a ./html/* "$pkgdir/usr/share/webapps/$pkgname"
-        chown http:http ${pkgdir}/usr/share/webapps/$pkgname # write access for http user
 	install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/nfsen.service" 
 	install -Dm644 "$srcdir/tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/nfsen.conf" 
 	install -Dm644 BSD-license.txt "$pkgdir/usr/share/license/$pkgname/BSD-license.txt" 
@@ -59,8 +44,8 @@ package() {
 	install -Dm755 "$srcdir/profile.sh" "$pkgdir/etc/profile.d/nfsen.sh"
 }
 md5sums=('fc45b3f44a66c2ed65d1269e479c2414'
-         'fa81120f06b2dbcfc97c73c06b0718f6'
+         '19baa378b5251305d5b6b209f90f81f2'
          'e8ffd8c767aca866050d679b609a0db9'
-         'e3ed23c170911bd25d5a5e61de512675'
+         'ad1b4a004dacd0508033fcfca763a2fe'
          '69898397995d35b1d53d6a61b16b24a8'
          'd60d7334fb00e85ea3230f059ae660aa')
diff --git a/install b/install
index 9a7b0d9e58fc..4e6117b1175a 100644
--- a/install
+++ b/install
@@ -1,5 +1,13 @@
 post_install() {
 	getent group netflow &>/dev/null || groupadd -r -g 44 netflow >/dev/null
-	getent passwd netflow &>/dev/null || useradd -r -u 44 -g netflow -d /var/lib/nfsen -s /bin/false -G http netflow >/dev/null
+	getent passwd netflow &>/dev/null || useradd -r -u 44 -g netflow -d /var/lib/nfsen -s /bin/false -G netflow http >/dev/null
 	usr/bin/systemd-tmpfiles --create nfsen.conf || true
+        echo ''
+        echo '::'
+        echo ':: NOTE:'
+        echo ':: To complete the installation, run:'
+        echo '::    cd /usr/share/webapps'
+        echo '::    su -c "./install.pl /etc/nfsen.conf"'
+        echo '::'
+        echo ''
 }
diff --git a/profile.sh b/profile.sh
index f50c4efcf568..e47e52cae8f1 100755
--- a/profile.sh
+++ b/profile.sh
@@ -1,5 +1,4 @@
 [ -d /opt/nfsen/bin ] && PATH=$PATH:/opt/nfsen/bin
-#[ -d /opt/nfsen/libexec ] && PATH=$PATH:/opt/nfsen/libexec
 
 export PATH