diff options
| author | Allan McRae <allan@archlinux.org> | 2010-06-20 15:26:47 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-06-21 04:00:49 +0200 |
| commit | c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 (patch) | |
| tree | 7ed6c317eb6e69737b8455a882b186bc2f950f8c | |
| parent | 6c00ca8f234cfcbfde7e36b68d85f9dcab5716c8 (diff) | |
| download | pacman-c2cf6a14cf44400d0ef249b38d37eb04d3424bf4.tar.gz pacman-c2cf6a14cf44400d0ef249b38d37eb04d3424bf4.tar.xz | |
makepkg: revert bash4-ism
Commit 3d67d9b1 introduced multiple bash4 string manipulations.
Revert those in order retain compatibility with bash-3.2 which
is still widely used.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e64b5646..4f9f89b1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -265,11 +265,11 @@ check_buildenv() { # ? - not found ## in_opt_array() { - local needle="${1,,}"; shift + local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift local opt for opt in "$@"; do - opt="${opt,,}" + opt=$(tr '[:upper:]' '[:lower:]' <<< $opt) if [[ $opt = $needle ]]; then echo 'y' # Enabled return @@ -554,7 +554,7 @@ generate_checksums() { local integ for integ in ${integlist[@]}; do - integ="${integ,,}" + integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ") case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) @@ -617,7 +617,7 @@ check_checksums() { fi if (( $found )) ; then - local expectedsum="${integrity_sums[$idx],,}" + local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") local realsum="$(openssl dgst -${integ} "$file")" realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then @@ -1669,7 +1669,7 @@ if (( CLEANCACHE )); then echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer - answer="${answer^^}" + answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then rm "$SRCDEST"/* if (( $? )); then |