upgpkg: oclhashcat 1.37-2

cleaning up PKGBUILD

2 files changed, 28 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bbd17e56db9..a86811df1566 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = oclhashcat
-	pkgdesc = Worlds fastest password cracker with dictionary mutation engine
+	pkgdesc = Worlds fastest password cracker with dictionary mutation engine (for AMD)
 	pkgver = 1.37
-	pkgrel = 1
-	url = http://hashcat.net/oclhashcat/
+	pkgrel = 2
+	url = https://hashcat.net/oclhashcat
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -11,7 +11,7 @@ pkgbase = oclhashcat
 	conflicts = oclhashcat-amd
 	replaces = oclhashcat-amd
 	options = !strip
-	source = http://hashcat.net/files/oclHashcat-1.37.7z
+	source = https://hashcat.net/files/oclHashcat-1.37.7z
 	sha512sums = 74d5ef5be20357e706bfbff496a60e8c2d90b33e93981bca398d04099645bef0ec8df9b77f179bb770312966f788a2fe7a486abdf9a3e7bee7b0204d2d900902
 
 pkgname = oclhashcat
diff --git a/PKGBUILD b/PKGBUILD
index 6a23d351ddbe..4eac194ee6d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
-# Maintainer: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com>
 
 pkgname=oclhashcat
 _pkgname=oclHashcat
 pkgver=1.37
-pkgrel=1
-pkgdesc="Worlds fastest password cracker with dictionary mutation engine"
-url=('http://hashcat.net/oclhashcat/')
+pkgrel=2
+pkgdesc="Worlds fastest password cracker with dictionary mutation engine (for AMD)"
+url=('https://hashcat.net/oclhashcat')
 arch=('i686' 'x86_64')
 license=('custom')
 depends=('catalyst-utils=14.9' 'opencl-catalyst=14.9')
-source=("http://hashcat.net/files/${_pkgname}-${pkgver}.7z")
-sha512sums=('74d5ef5be20357e706bfbff496a60e8c2d90b33e93981bca398d04099645bef0ec8df9b77f179bb770312966f788a2fe7a486abdf9a3e7bee7b0204d2d900902')
-options=('!strip')
 replaces=('oclhashcat-amd')
 conflicts=('oclhashcat-amd')
+options=('!strip')
+source=(https://hashcat.net/files/${_pkgname}-${pkgver}.7z)
+sha512sums=('74d5ef5be20357e706bfbff496a60e8c2d90b33e93981bca398d04099645bef0ec8df9b77f179bb770312966f788a2fe7a486abdf9a3e7bee7b0204d2d900902')
 
 package() {
-    find "${srcdir}/${_pkgname}-${pkgver}" \( -name "*.cmd" -o -name "*.exe" \) -print | xargs -i rm {}
-    mkdir -p "${pkgdir}/opt" "${pkgdir}/usr/bin"
-    if [ "${CARCH}" = "x86_64" ]; then
-        rm "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}32.bin"
-        mv "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}64.bin" "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}"
-    else
-        rm "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}64.bin"
-        mv "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}32.bin" "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}"
-    fi
-    echo -e "#!/bin/bash\n/opt/${_pkgname}/${_pkgname} \$@" > "$pkgdir/usr/bin/${_pkgname}"
-    chmod a+x "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}" "$pkgdir/usr/bin/${_pkgname}"
-    cp -r "${srcdir}/${_pkgname}-${pkgver}" "${pkgdir}/opt/${_pkgname}"
-    chmod 666 ${pkgdir}/opt/${_pkgname}/kernels/*/*
-    install -d -m777 "${pkgdir}/opt/${_pkgname}"
+  cd ${_pkgname}-${pkgver}
+  find . \( -name "*.cmd" -o -name "*.exe" \) -print | xargs -i rm {}
+  install -d "${pkgdir}/opt" "${pkgdir}/usr/bin"
+  if [ "${CARCH}" = "x86_64" ]; then
+    rm ${_pkgname}32.bin
+    mv ${_pkgname}64.bin ${_pkgname}
+  else
+    rm ${_pkgname}64.bin
+    mv ${_pkgname}32.bin ${_pkgname}
+  fi
+  echo -e "#!/bin/sh\n/opt/${_pkgname}/${_pkgname} \$@" > "${pkgdir}/usr/bin/${_pkgname}"
+  chmod +x ${_pkgname} "${pkgdir}/usr/bin/${_pkgname}"
+  chmod -R +r .
+  cp -r . "${pkgdir}/opt/${_pkgname}"
 }
+
+# vim: ts=2 sw=2 et: