upgpkg: iptrafvol 0.3.4-4

iptrafvol; cleanup PKGBUILD and move binaries to /usr/bin/

1 files changed, 14 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index deb10d7fcc1e..003b80ebfa50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,36 +27,36 @@ md5sums=('21d96650dd6452792ad47a5636954053'
          '4201e99e219f92ec7b5147c65c09fda9')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch < $srcdir/fix-pod.patch
+  cd "$srcdir"/${pkgname}-${pkgver}
+  patch < "$srcdir"/fix-pod.patch
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir"/${pkgname}-${pkgver}
 
   # generate man page
   pod2man iptrafvol.pl > iptrafvol.1
   gzip --force iptrafvol.1
 
   # install directories
-  install -d ${pkgdir}/var/log/iptrafvol
+  install -d "$pkgdir"/var/log/iptrafvol
 
   # install files
-  install -D -m755 iptrafvol.pl ${pkgdir}/usr/sbin/iptrafvol.pl
-  install -D -m644 iptrafvol.cgi ${pkgdir}/usr/share/${pkgname}/iptrafvol.cgi
-  install -D -m644 orange.css ${pkgdir}/usr/share/${pkgname}/orange.css
-  install -D -m644 Examples/iptrafvol_cron.d ${pkgdir}/usr/share/${pkgname}/iptrafvol_cron.d
-  install -D -m644 Examples/iptrafvol_init.d ${pkgdir}/usr/share/${pkgname}/iptrafvol_init.d
-  install -D -m644 iptrafvol.1.gz ${pkgdir}/usr/share/man/man1/iptrafvol.1.gz
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -D -m755 iptrafvol.pl "$pkgdir"/usr/bin/iptrafvol.pl
+  install -D -m644 iptrafvol.cgi "$pkgdir"/usr/share/${pkgname}/iptrafvol.cgi
+  install -D -m644 orange.css "$pkgdir"/usr/share/${pkgname}/orange.css
+  install -D -m644 Examples/iptrafvol_cron.d "$pkgdir"/usr/share/${pkgname}/iptrafvol_cron.d
+  install -D -m644 Examples/iptrafvol_init.d "$pkgdir"/usr/share/${pkgname}/iptrafvol_init.d
+  install -D -m644 iptrafvol.1.gz "$pkgdir"/usr/share/man/man1/iptrafvol.1.gz
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
 
   # adapt config to suits arch
   sed \
-    -e 's|/sbin/iptables|/usr/sbin/iptables|' \
-    -i "$pkgdir"/usr/sbin/iptrafvol.pl
+    -e 's|/sbin/iptables|/usr/bin/iptables|' \
+    -i "$pkgdir"/usr/bin/iptrafvol.pl
 
   sed \
-    -e 's|/usr/local/sbin/iptrafvol.pl|/usr/sbin/iptrafvol.pl|' \
+    -e 's|/usr/local/sbin/iptrafvol.pl|/usr/bin/iptrafvol.pl|' \
     -i "$pkgdir"/usr/share/${pkgname}/iptrafvol.cgi \
     -i "$pkgdir"/usr/share/${pkgname}/iptrafvol_cron.d
 }