diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2008-06-15 12:56:40 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-06-15 13:53:15 -0500 |
| commit | 7ff5a917fd0a91cd03ba61419a57053e4ae17e92 (patch) | |
| tree | 45d3598f92474ae161ac55b9ce671c2da0a4861f | |
| parent | b9445c12cf9e958d8e62f9f9ecb5c1352010cdf4 (diff) | |
| download | pacman-7ff5a917fd0a91cd03ba61419a57053e4ae17e92.tar.xz | |
makepkg: add several quotes needed after nullglob.
After the "shopt -s nullglob" change, all regular expressions should be
properly quoted.
This commit only fixes the ones I found, there are probably others left, so
this should be kept in mind for easier future fixing.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 438335ec..bce2e6cd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -221,11 +221,11 @@ check_buildenv() { # ? - not found ## in_opt_array() { - local needle=$(echo $1 | tr [:upper:] [:lower:]); shift + local needle=$(echo $1 | tr '[:upper:]' '[:lower:]'); shift local opt for opt in "$@"; do - opt=$(echo $opt | tr [:upper:] [:lower:]) + opt=$(echo $opt | tr '[:upper:]' '[:lower:]') if [ "$opt" = "$needle" ]; then echo 'y' # Enabled return @@ -476,7 +476,7 @@ generate_checksums() { local integ for integ in ${INTEGRITY_CHECK[@]}; do - integ="$(echo $integ | tr [:upper:] [:lower:])" + integ="$(echo $integ | tr '[:upper:]' '[:lower:]')" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) @@ -528,7 +528,7 @@ generate_checksums() { check_checksums() { local integ for integ in ${INTEGRITY_CHECK[@]}; do - integ="$(echo $integ | tr [:upper:] [:lower:])" + integ="$(echo $integ | tr '[:upper:]' '[:lower:]')" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) @@ -541,7 +541,7 @@ check_checksums() { exit 1 # $E_MISSING_PROGRAM fi - local integrity_sums=($(eval echo \${${integ}sums[@]})) + local integrity_sums=($(eval echo "\${${integ}sums[@]}")) if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then msg "$(gettext "Validating source files with %s...")" "${integ}sums" local errors=0 @@ -1214,7 +1214,7 @@ if [ "$CLEANCACHE" = "1" ]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" echo -n "$(gettext " Are you sure you wish to do this? [Y/n] ")" read answer - answer=$(echo $answer | tr [:upper:] [:lower:]) + answer=$(echo $answer | tr '[:upper:]' '[:lower:]') if [ "$answer" = "yes" -o "$answer" = "y" ]; then rm "$SRCDEST"/* if [ $? -ne 0 ]; then |