More PKGBUILD cleanup, stop using variables for package name for better readability.

1 files changed, 26 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4c3b844223cd..3fece42f8801 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@ pkgname=sabnzbd
 _pkgname=SABnzbd
 pkgver=2.3.9
 pkgrel=1
-pkgdesc="A web-interface based binary newsgrabber with NZB file support"
-url="http://www.sabnzbd.org"
+pkgdesc='A web-interface based binary newsgrabber with NZB file support'
+url='http://www.sabnzbd.org'
 arch=('any')
 license=('GPL')
 depends=('curl'
@@ -20,19 +20,19 @@ optdepends=('xdg-utils: registration of .nzb files'
             'python2-pyopenssl: ssl support'
             'par2cmdline-tbb: par2 multi-threading')
 
-install="${pkgname}.install"
-backup=('etc/conf.d/sabnzbd' "opt/${pkgname}/${pkgname}.ini")
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.gz"
-        "${pkgname}"
-        "${pkgname}.desktop"
+install='sabnzbd.install'
+backup=('etc/conf.d/sabnzbd' 'opt/sabnzbd/sabnzbd.ini')
+source=("https://github.com/sabnzbd/sabnzbd/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.gz"
+        'sabnzbd'
+        'sabnzbd.desktop'
         'addnzb.sh'
         'nzb.png'
         'sabnzbd.png'
         'x-nzb.xml'
-        "${pkgname}.service"
+        'sabnzbd.service'
         'sabnzbd.sysusers'
         'sabnzbd.tmpfiles'
-        "${pkgname}.confd")
+        'sabnzbd.confd')
 
 sha256sums=('f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c'
             '82630edfc767a383843ffaae9d716e99010dad9e93bdee08d541faa74e694a65'
@@ -47,26 +47,26 @@ sha256sums=('f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c'
             '8462203454d488b5d4f7beb85e61da2efa42d3dffa465f3bf16a95abe0bc7c0a')
 
 package() {
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  touch "${pkgdir}/opt/${pkgname}/${pkgname}.ini"
-  cp -r "${srcdir}/${_pkgname}-${pkgver}/"* "${pkgdir}/opt/${pkgname}"
+  mkdir -p "${pkgdir}/opt/sabnzbd"
+  touch "${pkgdir}/opt/sabnzbd/sabnzbd.ini"
+  cp -r "${srcdir}/SABnzbd-${pkgver}/"* "${pkgdir}/opt/sabnzbd"
 
   # Fix for issues with Python 3
-  find "${pkgdir}/opt/${pkgname}" -type f -exec sed -i 's/python/python2/g' {} \;
-  find "${pkgdir}/opt/${pkgname}" -type d -exec chmod 755 {} \;
-  find "${pkgdir}/opt/${pkgname}" -type f -exec chmod 644 {} \;
-  chmod 755 "${pkgdir}/opt/${pkgname}/${_pkgname}.py"
+  find "${pkgdir}/opt/sabnzbd" -type f -exec sed -i 's/python/python2/g' {} \;
+  find "${pkgdir}/opt/sabnzbd" -type d -exec chmod 755 {} \;
+  find "${pkgdir}/opt/sabnzbd" -type f -exec chmod 644 {} \;
+  chmod 755 "${pkgdir}/opt/sabnzbd/SABnzbd.py"
 
-  install -Dm755 "${srcdir}/${pkgname}"       "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname}.confd" "${pkgdir}/etc/conf.d/${pkgname}"
+  install -D -m 755 "${srcdir}/sabnzbd"       "${pkgdir}/usr/bin/sabnzbd"
+  install -D -m 644 "${srcdir}/sabnzbd.confd" "${pkgdir}/etc/conf.d/sabnzbd"
 
-  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm644 "${srcdir}/sabnzbd.sysusers" "${pkgdir}/usr/lib/sysusers.d/sabnzbd.conf"
-  install -Dm644 "${srcdir}/sabnzbd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/sabnzbd.conf"
+  install -D -m 644 "${srcdir}/sabnzbd.service" "${pkgdir}/usr/lib/systemd/system/sabnzbd.service"
+  install -D -m 644 "${srcdir}/sabnzbd.sysusers" "${pkgdir}/usr/lib/sysusers.d/sabnzbd.conf"
+  install -D -m 644 "${srcdir}/sabnzbd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/sabnzbd.conf"
 
-  install -Dm755 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm755 "${srcdir}/addnzb.sh"    "${pkgdir}/opt/${pkgname}/addnzb.sh"
-  install -Dm644 "${srcdir}/nzb.png"    "${pkgdir}/opt/${pkgname}/nzb.png"
-  install -Dm644 "${srcdir}/sabnzbd.png"  "${pkgdir}/opt/${pkgname}/sabnzbd.png"
-  install -Dm770 "${srcdir}/x-nzb.xml"    "${pkgdir}/opt/${pkgname}/x-nzb.xml"
+  install -D -m 755 "${srcdir}/sabnzbd.desktop" "${pkgdir}/usr/share/applications/sabnzbd.desktop"
+  install -D -m 755 "${srcdir}/addnzb.sh"    "${pkgdir}/opt/sabnzbd/addnzb.sh"
+  install -D -m 644 "${srcdir}/nzb.png"    "${pkgdir}/opt/sabnzbd/nzb.png"
+  install -D -m 644 "${srcdir}/sabnzbd.png"  "${pkgdir}/opt/sabnzbd/sabnzbd.png"
+  install -D -m 770 "${srcdir}/x-nzb.xml"    "${pkgdir}/opt/sabnzbd/x-nzb.xml"
 }