From ea697dc10fe054cc81d1c82db62228bb7708d7a3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 8 Jul 2013 23:13:59 -0600
Subject: librefetch: drop compatibility code for old versions of makepkg.

---
 src/librefetch/librefetch | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/librefetch')

diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch
index 07303ae..e3b9c65 100755
--- a/src/librefetch/librefetch
+++ b/src/librefetch/librefetch
@@ -87,7 +87,7 @@ main() {
 	else
 		srcbuild="$(modified_pkgbuild "$BUILDFILE")"
 	fi
-	makepkg="$(modified_makepkg "$(which "${MAKEPKG:-makepkg}")")"
+	makepkg="$(modified_makepkg "$(which makepkg)")"
 
 	# Mode: checksums ######################################################
 
@@ -189,7 +189,6 @@ parse_options() {
 makepkg_modify='
 /create_package\(\) \{/,/^\}$/ {
 	/pkg_file=/d                  # allow us to set pkg_file
-	/check_package/d              # do not run check_package
 	s/"?\$\{comp_files\[@\]\}"?// # do not include .{PKGINFO,INSTALL,CHANGELOG}
 	s/bsdtar /&--format=ustar /   # ustar, not pax
 }
@@ -271,12 +270,7 @@ fi
 prepare() { rm -rf "$pkgdir"; }
 build() { mksource; }
 check() { :; }
-package() {
-  if [[ $(ls "$pkgdir" | wc -l) -eq 0 ]]; then
-    # pkgdir is empty; provide good default behavior
-    cp -a "${srcdir}"/*/ "$pkgdir/"
-  fi
-}
+package() { cp -a "$srcdir"/*/ "$pkgdir/"; }
 '
 
 modified_pkgbuild() {
-- 
cgit v1.2.3