diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-08 23:13:59 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-08 23:13:59 -0600 |
| commit | ea697dc10fe054cc81d1c82db62228bb7708d7a3 (patch) | |
| tree | 6336faadd2d7f617a6e014bced9b4cfdfc7648fe | |
| parent | 3f87ea5a27b080756b3994674d842185e3e0c496 (diff) | |
librefetch: drop compatibility code for old versions of makepkg.
| -rwxr-xr-x | src/librefetch/librefetch | 10 |
1 files changed, 2 insertions, 8 deletions
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() { |