safer build

2 files changed, 31 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb706c33681e..7b607a8ef8ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-root_numpy
 	pkgdesc = The interface between ROOT and NumPy
 	pkgver = 4.7.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://scikit-hep.org/root_numpy/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b5b65da831de..75956d8f933f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=python-root_numpy
 _pkgbase=root_numpy
 pkgname=('python2-root_numpy' 'python-root_numpy')
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The interface between ROOT and NumPy"
 arch=('i686' 'x86_64')
 url="http://scikit-hep.org/root_numpy/"
@@ -17,52 +17,54 @@ source=("https://github.com/scikit-hep/${_pkgbase}/archive/${pkgver}.zip")
 sha256sums=('62f467ffad6608566c943b8dffea212e12caccc96155e81ba451a1034adf1f33')
 
 prepare() {
-  cd "$srcdir"
-  cp -a root_numpy-$pkgver root_numpy-py2-$pkgver
-  cd root_numpy-py2-$pkgver
+  cd "${srcdir}"
+  cp -a "root_numpy-${pkgver}" "root_numpy-py2-${pkgver}"
+  cd "root_numpy-py2-${pkgver}"
 
-  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-      -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-      -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-      -i $(find . -name '*.py')
+  msg2 "Adjusting Python 2 shebangs..."
+  find . -name '*.py' -type f -exec \
+      sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+          -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+          -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+          -i '{}' \; -print
 }
 
 build() {
-  msg "Building Python2"
-  cd "$srcdir"/root_numpy-py2-$pkgver
+  msg2 "Building Python2"
+  cd "${srcdir}/root_numpy-py2-${pkgver}"
   python2 setup.py build
 
-  msg "Building Python3"
-  cd "$srcdir"/root_numpy-$pkgver
+  msg2 "Building Python3"
+  cd "${srcdir}/root_numpy-${pkgver}"
   python setup.py build
 }
 
 package_python2-root_numpy() {
   depends=('python2-numpy' 'root')
-  cd "$srcdir"/root_numpy-py2-$pkgver
+  cd "${srcdir}/root_numpy-py2-${pkgver}"
 
-  python2 setup.py install --root="$pkgdir"/ --optimize=1
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  install -d "$pkgdir"/usr/share/doc/$pkgname
-  cp -r benchmarks "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r docs "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r examples "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r paper "$pkgdir"/usr/share/doc/$pkgname/
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
 }
 
 package_python-root_numpy() {
   depends=('python-numpy' 'root')
-  cd "$srcdir"/root_numpy-$pkgver
+  cd "${srcdir}/root_numpy-${pkgver}"
 
-  python setup.py install --root="$pkgdir"/ --optimize=1
+  python setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  install -d "$pkgdir"/usr/share/doc/$pkgname
-  cp -r benchmarks "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r docs "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r examples "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r paper "$pkgdir"/usr/share/doc/$pkgname/
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
 }