Version update + clean-up

1 files changed, 66 insertions, 43 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3f69fbab7c18..3ded2acfb689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,37 @@
 # Maintainer: Pierre Lalet <pl@ivre.rocks>
 
-pkgbase='ivre-git'
-pkgbasename='ivre'
+pkgbase=ivre-git
+_pkgname=ivre
 pkgname=('ivre-git' 'ivre-web-git' 'ivre-docs-git' 'python-ivre-git' 'python2-ivre-git')
-pkgver=0.9.13.dev14
+pkgver=0.9.13.dev21
 pkgrel=1
 pkgdesc='Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,...'
 arch=('any')
 url='https://ivre.rocks/'
 license=('GPL3')
 makedepends=('git')
-source=("git+https://github.com/cea-sec/ivre.git")
-sha256sums=('SKIP')
+source=('git+https://github.com/cea-sec/ivre.git')
+sha512sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$pkgbasename"
+  cd "$srcdir/$_pkgname"
+
   python setup.py --version 2>/dev/null
 }
 
 prepare() {
-    cp -a ${srcdir}/${pkgbasename}{,-py2}
+  cp -a $srcdir/$_pkgname{,-py2}
 }
 
 build() {
   (
-    cd "$srcdir/$pkgbasename"
+    cd "$srcdir/$_pkgname"
+
     python setup.py build
   )
   (
-    cd "$srcdir/$pkgbasename-py2"
+    cd "$srcdir/$_pkgname-py2"
+
     python2 setup.py build
   )
 }
@@ -48,12 +51,16 @@ package_ivre-git() {
               'ffmpeg: RTSP Screenshots via Nmap script')
   provides=('ivre')
   conflicts=('ivre')
-  cd "$srcdir/$pkgbasename"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/doc" \
-     "${pkgdir}/usr/share/ivre/dokuwiki" \
-     "${pkgdir}/usr/share/ivre/web"
+
+  cd "$srcdir/$_pkgname"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/doc" \
+     "$pkgdir/usr/share/ivre/dokuwiki" \
+     "$pkgdir/usr/share/ivre/web"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
 }
 
@@ -61,13 +68,16 @@ package_ivre-docs-git() {
   provides=('ivre-docs')
   conflicts=('ivre-docs')
   pkgdesc+=' (documentation)'
-  cd "$srcdir/$pkgbasename"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  cp README.md "${pkgdir}/usr/share/doc/ivre/"
-  mv "${pkgdir}/usr/share/ivre/web/static/doc" "${pkgdir}/usr/share/doc/ivre/html"
-  rm -r "${pkgdir}/usr/bin" "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/ivre" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  cd "$srcdir/$_pkgname"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  cp README.md "$pkgdir/usr/share/doc/ivre/"
+  mv "$pkgdir/usr/share/ivre/web/static/doc" "$pkgdir/usr/share/doc/ivre/html"
+  rm -r "$pkgdir/usr/bin" "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/ivre" \
+     "$pkgdir/etc/bash_completion.d"
 }
 
 package_ivre-web-git() {
@@ -79,17 +89,21 @@ package_ivre-web-git() {
   conflicts=('ivre-web')
   pkgdesc+=' (web application)'
   backup=('etc/httpd/conf/extra/ivre.conf')
-  cd "$srcdir/$pkgbasename"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/doc" \
-     "${pkgdir}/usr/share/ivre/bro" \
-     "${pkgdir}/usr/share/ivre/data" \
-     "${pkgdir}/usr/share/ivre/docker" \
-     "${pkgdir}/usr/share/ivre/geoip" \
-     "${pkgdir}/usr/share/ivre/honeyd" \
-     "${pkgdir}/usr/share/ivre/nmap_scripts" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  cd "$srcdir/$_pkgname"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/bin" "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/doc" \
+     "$pkgdir/usr/share/ivre/bro" \
+     "$pkgdir/usr/share/ivre/data" \
+     "$pkgdir/usr/share/ivre/docker" \
+     "$pkgdir/usr/share/ivre/geoip" \
+     "$pkgdir/usr/share/ivre/honeyd" \
+     "$pkgdir/usr/share/ivre/nmap_scripts" \
+     "$pkgdir/etc/bash_completion.d"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
   install -Dm0644 "pkg/apache/ivre.conf" "$pkgdir/etc/httpd/conf/extra/ivre.conf"
 }
@@ -111,11 +125,15 @@ package_python-ivre-git() {
   provides=('python-ivre')
   conflicts=('python-ivre')
   pkgdesc+=' (library)'
-  cd "$srcdir/$pkgbasename"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" \
-     "${pkgdir}/usr/share" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  cd "$srcdir/$_pkgname"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/bin" \
+     "$pkgdir/usr/share" \
+     "$pkgdir/etc/bash_completion.d"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
 }
 
@@ -136,10 +154,15 @@ package_python2-ivre-git() {
   provides=('python2-ivre')
   conflicts=('python2-ivre')
   pkgdesc+=' (library)'
-  cd "$srcdir/$pkgbasename-py2"
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" \
-     "${pkgdir}/usr/share" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  cd "$srcdir/$_pkgname-py2"
+
+  python2 setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/bin" \
+     "$pkgdir/usr/share" \
+     "$pkgdir/etc/bash_completion.d"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
 }
+