diff options
| author | Dan McGee <dan@archlinux.org> | 2011-11-20 21:40:50 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-11-20 21:40:50 -0600 |
| commit | 96b3ba3470f11842312e4fdb34b74b391842fc33 (patch) | |
| tree | 5c60dff639bfa7f8f674e995ecbab4f7fc07064a /scripts | |
| parent | 2141b7112d237221280781bed2b2bb6efadc963e (diff) | |
| parent | 507a2d15e65aba93a20ee99d90345917866407dc (diff) | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 6 | ||||
| -rw-r--r-- | scripts/po/Makevars | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 914cacbe..26a27899 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1441,7 +1441,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]:-]* ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1450,7 +1450,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]-]* ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 @@ -1459,7 +1459,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i != *([[:digit:]]) ]]; then error "$(gettext "%s must be an integer.")" "epoch" return 1 diff --git a/scripts/po/Makevars b/scripts/po/Makevars index 178b4dc7..494da1d7 100644 --- a/scripts/po/Makevars +++ b/scripts/po/Makevars @@ -8,9 +8,7 @@ subdir = scripts/po top_builddir = ../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ - --keyword=_ --flag=_:1:c-format \ - --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format +XGETTEXT_OPTIONS = --no-location # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding |