diff options
| -rwxr-xr-x | src/librefetch/librefetch | 2 | ||||
| -rwxr-xr-x | src/pkgbuild-check-nonfree | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 9aa4641..5428655 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -290,7 +290,7 @@ modified_pkgbuild() { modified_srcbuild() { local orig=$1 local new="$tempdir/SRCBUILD" - sed -e '/PKGDEST=/d' -e 's/PKGEXT=/d' < "$orig" > "$new" + sed -e '/PKGDEST=/d' -e '/PKGEXT=/d' < "$orig" > "$new" printf '%s\n' "$new" } diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree index 9b006c0..5d7a1ae 100755 --- a/src/pkgbuild-check-nonfree +++ b/src/pkgbuild-check-nonfree @@ -35,13 +35,13 @@ check_deps() ( exit 1 # not a PKGBUILD fi - msg2 "Looking for unfree dependencies of ${pkgbase:-${pkgname[0]}} $(get_full_version)" + msg2 'Looking for unfree dependencies of %s %s' "${pkgbase:-${pkgname[0]}}" "$(get_full_version)" local pkgs=( # packages being built "${pkgname[@]}" # depends - "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" + "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" "${optdepends[@]%%:*}" # mksource depends "${mkdepends[@]}" ) @@ -51,18 +51,18 @@ check_deps() ( local rep="$(blacklist-get-rep <<<"$line")" if [[ -z $line ]]; then # not mentioned in blacklist; free - plain "$pkg: free" + plain '%s: free' "$pkg" continue elif [[ -z $rep ]]; then # non-free with no replacement - plain "$pkg: non-free" + plain '%s: non-free' "$pkg" ret=1 else # non-free with free replacement if [[ "$rep" == "$pkg" ]]; then - plain "$pkg: repackaged with the same name." + plain '%s: repackaged with the same name.' "$pkg" else - plain "$pkg: replaced by $rep" + plain '%s: replaced by ' "$pkg" "$rep" fi fi done |