Updated version to 8.2.0-1

2 files changed, 15 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86ad7d77b13a..50dbd1b5840a 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = makedeb-alpha
 	pkgdesc = The modern packaging tool for Debian archives (alpha release)
-	pkgver = 8.1.1
+	pkgver = 8.2.0
 	pkgrel = 1
 	url = https://github.com/makedeb/makedeb
 	arch = any
 	license = GPL3
+	makedepends = asciidoctor
 	makedepends = git
+	makedepends = make
 	depends = tar
 	depends = binutils
 	depends = lsb-release
@@ -14,7 +16,7 @@ pkgbase = makedeb-alpha
 	depends = makedeb-makepkg-alpha
 	conflicts = makedeb
 	conflicts = makedeb-beta
-	source = git+https://github.com/makedeb/makedeb/#tag=v8.1.1-alpha
+	source = makedeb::git+https://github.com/makedeb/makedeb/#tag=v8.2.0-1-alpha
 	sha256sums = SKIP
 
 pkgname = makedeb-alpha
diff --git a/PKGBUILD b/PKGBUILD
index 80714a71926d..c93452854927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,27 @@
-# Maintainer: Hunter Wittenborn: <hunter@hunterwittenborn.com>
-_release_type=alpha
+# Maintainer: Hunter Wittenborn <hunter@hunterwittenborn.com>
+_release=alpha
+_target=aur
 
 pkgname=makedeb-alpha
-pkgver=8.1.1
+pkgver=8.2.0
 pkgrel=1
-pkgdesc="The modern packaging tool for Debian archives (${_release_type} release)"
+pkgdesc="The modern packaging tool for Debian archives (${_release} release)"
 arch=('any')
 license=('GPL3')
 depends=('tar' 'binutils' 'lsb-release' 'dpkg' 'asciidoctor' 'makedeb-makepkg-alpha')
-makedepends=('git')
+makedepends=('asciidoctor' 'git' 'make')
 conflicts=('makedeb' 'makedeb-beta')
 url="https://github.com/makedeb/makedeb"
 
-source=("git+${url}/#tag=v${pkgver}-${_release_type}")
+source=("makedeb::git+${url}/#tag=v${pkgver}-${pkgrel}-${_release}")
 sha256sums=('SKIP')
 
 prepare() {
-  cd makedeb/
-
-  # Set package version, release type, and target OS
-  sed -i "s|makedeb_package_version=.*|makedeb_package_version=${pkgver}-${pkgrel}|"  src/makedeb.sh
-  sed -i "s|makedeb_release_type=.*|makedeb_release_type=${_release_type}|" src/makedeb.sh
-  sed -i 's|target_os="debian"|target_os="arch"|' src/makedeb.sh
-
-  # Remove testing commands
-  sed -i 's|.*# REMOVE AT PACKAGING||g' src/makedeb.sh
+	cd makedeb/
+	make prepare PKGVER="${pkgver}" RELEASE="${_release}" TARGET="${_target}"
 }
 
 package() {
-  # Create single file for makedeb
-  mkdir -p "${pkgdir}/usr/bin"
-  cd makedeb/
-
-  # Add bash shebang
-  echo '#!/usr/bin/env bash' > "${pkgdir}/usr/bin/makedeb"
-
-  # Copy functions
-  for i in $(find "src/functions/"); do
-    if ! [[ -d "${i}" ]]; then
-      cat "${i}" >> "${pkgdir}/usr/bin/makedeb"
-    fi
-  done
-  
-  # Copy over extra utilities.
-  cd ./src/utils/
-  find ./ -type f -exec install -Dm 755 '{}' "${pkgdir}/usr/share/makedeb/utils/{}" \;
-  cd ../../
-
-  cat "src/makedeb.sh" >> "${pkgdir}/usr/bin/makedeb"
-  chmod 555 "${pkgdir}/usr/bin/makedeb"
-
-  # Set up man pages
-  SOURCE_DATE_EPOCH="$(git log -1 --pretty='%ct' man/makedeb.8.adoc)" \
-    asciidoctor -b manpage man/makedeb.8.adoc \
-                -o "${pkgdir}/usr/share/man/man8/makedeb.8"
-
-  SOURCE_DATE_EPOCH="$(git log -1 --pretty='%ct' man/pkgbuild.5.adoc)" \
-    asciidoctor -b manpage man/pkgbuild.5.adoc \
-                -o "${pkgdir}/usr/share/man/man5/pkgbuild.5"
+	cd makedeb/
+	make package DESTDIR="${pkgdir}"
 }