moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 16:28:50 -05:00
Code Issues Releases Wiki Activity

makepkg: add several quotes needed after nullglob.

Browse Source 
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>
This commit is contained in:
Xavier Chantry 2008-06-15 12:56:40 +02:00 committed by Dan McGee
parent b9445c12cf
commit 7ff5a917fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/makepkg.sh.in
View File

@ -221,11 +221,11 @@ check_buildenv() {
# ? - not found # ? - not found
## ##
in_opt_array() { in_opt_array() {
local needle=$(echo $1 | tr [:upper:] [:lower:]); shift local needle=$(echo $1 | tr '[:upper:]' '[:lower:]'); shift
local opt local opt
for opt in "$@"; do for opt in "$@"; do
opt=$(echo $opt | tr [:upper:] [:lower:]) opt=$(echo $opt | tr '[:upper:]' '[:lower:]')
if [ "$opt" = "$needle" ]; then if [ "$opt" = "$needle" ]; then
echo 'y' # Enabled echo 'y' # Enabled
return return
@ -476,7 +476,7 @@ generate_checksums() {
local integ local integ
for integ in ${INTEGRITY_CHECK[@]}; do for integ in ${INTEGRITY_CHECK[@]}; do
integ="$(echo $integ | tr [:upper:] [:lower:])" integ="$(echo $integ | tr '[:upper:]' '[:lower:]')"
case "$integ" in case "$integ" in
md5|sha1|sha256|sha384|sha512) : ;; md5|sha1|sha256|sha384|sha512) : ;;
*) *)
@ -528,7 +528,7 @@ generate_checksums() {
check_checksums() { check_checksums() {
local integ local integ
for integ in ${INTEGRITY_CHECK[@]}; do for integ in ${INTEGRITY_CHECK[@]}; do
integ="$(echo $integ | tr [:upper:] [:lower:])" integ="$(echo $integ | tr '[:upper:]' '[:lower:]')"
case "$integ" in case "$integ" in
md5|sha1|sha256|sha384|sha512) : ;; md5|sha1|sha256|sha384|sha512) : ;;
*) *)
@ -541,7 +541,7 @@ check_checksums() {
exit 1 # $E_MISSING_PROGRAM exit 1 # $E_MISSING_PROGRAM
fi fi
local integrity_sums=($(eval echo \${${integ}sums[@]})) local integrity_sums=($(eval echo "\${${integ}sums[@]}"))
if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then
msg "$(gettext "Validating source files with %s...")" "${integ}sums" msg "$(gettext "Validating source files with %s...")" "${integ}sums"
local errors=0 local errors=0
@ -1214,7 +1214,7 @@ if [ "$CLEANCACHE" = "1" ]; then
msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST"
echo -n "$(gettext " Are you sure you wish to do this? [Y/n] ")" echo -n "$(gettext " Are you sure you wish to do this? [Y/n] ")"
read answer read answer
answer=$(echo $answer | tr [:upper:] [:lower:]) answer=$(echo $answer | tr '[:upper:]' '[:lower:]')
if [ "$answer" = "yes" -o "$answer" = "y" ]; then if [ "$answer" = "yes" -o "$answer" = "y" ]; then
rm "$SRCDEST"/* rm "$SRCDEST"/*
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then