moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 12:25:02 -05:00
Code Issues Releases Wiki Activity

makepkg: proper quoting in [[ expression ]]

Browse Source 
Always quote the righthand side of expression when the == or != operator
is used, unless intended as a pattern.  Quoting bash(1):

When the == and != operators are used, the string to the right of the
operator is considered a pattern.  Any part of the pattern may be quoted
to force it to be matched as a string.

Signed-off-by: lolilolicon <lolilolicon@gmail.com>
This commit is contained in:
lolilolicon 2011-09-28 13:06:03 -05:00 committed by Dan McGee
parent d1af9b70c8
commit 497501d1c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/makepkg.sh.in
View File

@ -414,7 +414,7 @@ download_file() {
fi
# rename the temporary download file to the final destination
if [[ $dlfile != $file ]]; then
if [[ $dlfile != "$file" ]]; then
mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file"
fi
}
@ -1509,7 +1509,7 @@ check_sanity() {
eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \
sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//')
for i in ${provides_list[@]}; do
if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
if [[ $i == *['<>']* ]]; then
error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides"
ret=1
fi
@ -1767,7 +1767,7 @@ devel_update() {
# _foo=pkgver
#
if [[ -n $newpkgver ]]; then
if [[ $newpkgver != $pkgver ]]; then
if [[ $newpkgver != "$pkgver" ]]; then
if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then
@SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE"
@SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE"