misc clean up

1 files changed, 21 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ed8b9d9f9dcb..4b1aa0d60214 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,18 @@
 # Maintainer: Carl George < arch at cgtx dot us >
 
 _name="falcon"
-_module="${_name}"
-_check="disabled"
+_module="$_name"
+#_check=1
 
-pkgname=("python-${_module}" "python2-${_module}")
-pkgver="1.1.0"
-pkgrel="3"
+pkgname=("python-$_module" "python2-$_module")
+pkgver=1.1.0
+pkgrel=3
 pkgdesc="An unladen web framework for building APIs and app backends."
 arch=("i686" "x86_64")
-url="https://github.com/falconry/${_name}"
+url="https://falconframework.org"
 license=("Apache")
-makedepends=("cython"
-             "python-setuptools"
-             "cython2"
-             "python2-setuptools")
-if [[ "${_check}" == "enabled" ]]; then
+makedepends=("cython" "python-setuptools" "cython2" "python2-setuptools")
+if [[ -v _check ]]; then
     checkdepends=("python-ddt"
                   "python-pytest"
                   "python-requests"
@@ -27,43 +24,35 @@ if [[ "${_check}" == "enabled" ]]; then
                   "python2-testtools"
                   "python2-yaml")
 fi
-source=("https://files.pythonhosted.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz")
+source=("https://files.pythonhosted.org/packages/source/${_name:0:1}/$_name/$_name-$pkgver.tar.gz")
 sha256sums=('a68c5685459427cc2129c7b9e3aa19ed5adc73b6adff8ca69fe09f6666885ae7')
 
-prepare() {
-    cp -a "${srcdir}/${_name}-${pkgver}" "${srcdir}/${_name}-${pkgver}-python2"
-}
-
 build() {
-    cd "${srcdir}/${_name}-${pkgver}"
+    cd "$_name-$pkgver"
     python setup.py build
-    cd "${srcdir}/${_name}-${pkgver}-python2"
     python2 setup.py build
 }
 
 check() {
-    if [[ "${_check}" == "enabled" ]]; then
-        cd "${srcdir}/${_name}-${pkgver}"
+    if [[ -v _check ]]; then
+        cd "$_name-$pkgver"
         python setup.py test
-        cd "${srcdir}/${_name}-${pkgver}-python2"
         python2 setup.py test
     else
-        echo "_check is not set to \"enabled\", skipping check()"
+        echo "skipping check()"
     fi
 }
 
 package_python-falcon() {
-    depends=("python-six>=1.4.0"
-             "python-mimeparse>=1.5.2")
-    cd "${srcdir}/${_name}-${pkgver}"
-    python setup.py install --skip-build --root="${pkgdir}" --optimize=1
+    depends=("python-six>=1.4.0" "python-mimeparse>=1.5.2")
+    cd "$_name-$pkgver"
+    python setup.py install --skip-build --root="$pkgdir" --optimize=1
 }
 
 package_python2-falcon() {
-    depends=("python2-six>=1.4.0"
-             "python2-mimeparse>=1.5.2")
-    cd "${srcdir}/${_name}-${pkgver}-python2"
-    python2 setup.py install --skip-build --root="${pkgdir}" --optimize=1
-    mv "${pkgdir}/usr/bin/falcon-bench" "${pkgdir}/usr/bin/falcon-bench-python2"
-    mv "${pkgdir}/usr/bin/falcon-print-routes" "${pkgdir}/usr/bin/falcon-print-routes-python2"
+    depends=("python2-six>=1.4.0" "python2-mimeparse>=1.5.2")
+    cd "$_name-$pkgver"
+    python2 setup.py install --skip-build --root="$pkgdir" --optimize=1
+    mv "$pkgdir/usr/bin/falcon-bench" "$pkgdir/usr/bin/falcon-bench-python2"
+    mv "$pkgdir/usr/bin/falcon-print-routes" "$pkgdir/usr/bin/falcon-print-routes-python2"
 }