From e589d617513767c99eb5e35f6fcdf74d6ed6b4fb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 29 Dec 2012 17:29:50 -0500 Subject: fix up both scripts --- moz-normalize-PKGBUILD | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'moz-normalize-PKGBUILD') diff --git a/moz-normalize-PKGBUILD b/moz-normalize-PKGBUILD index 930c47b..c254d19 100755 --- a/moz-normalize-PKGBUILD +++ b/moz-normalize-PKGBUILD @@ -54,7 +54,7 @@ sort-array() { normalize() { local file=$1 - for var in {make,check,opt,}depends arch license; do + for var in {make,check,}depends arch license; do format-array "$var" "$file" sort-array "$var" "$file" done @@ -63,7 +63,13 @@ normalize() { sed -ri 's/\s+$//' "$file" # generalize - sed -i 's/firefox/$pkgbase/g' "$file" + sed -ri \ + -e 's/([^=])firefox/\1$pkgbase/g' \ + -e 's/\$pkgbase-(install-dir\.patch)/firefox-\1/g' \ + "$file" + if ! grep -q pkgbase= "$file"; then + sed -i '/pkgdesc=/iif [[ -z $pkgbase ]]\; then pkgbase=$pkgname\; fi' "$file" + fi } main() { -- cgit v1.2.2