diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2015-01-09 20:55:36 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-01-11 09:56:57 +0100 |
| commit | 83d5512bf1f8b1321e239cb8efdcb3547213d011 (patch) | |
| tree | 014b37155d129c382d371cb303460b38486080f4 | |
| parent | 9e5e86aa146f6a63880df5ae17340156f7315eb0 (diff) | |
| download | pacman-83d5512bf1f8b1321e239cb8efdcb3547213d011.tar.gz pacman-83d5512bf1f8b1321e239cb8efdcb3547213d011.tar.xz | |
makepkg: avoid nested quoting in string replacement
I suspect this is just wrong -- you never need to quote the replacement
side of a PE. In bash 4.3, this is essentially a no-op, but because of
a bug in bash 4.2, we get embedded quotes as a result of this
replacement. The relevant changelog item in bash is:
Fixed a bug that caused single quotes that resulted from $'...' quoting
in the replacement portion of a double-quoted ${word/pat/rep} expansion
to be treated as quote characters.
But this doesn't apply to us. Let's just drop the excessive quoting...
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 873b7d29..ace44e23 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -362,11 +362,11 @@ download_file() { # replace %o by the temporary dlfile if it exists if [[ ${cmdline[*]} = *%o* ]]; then dlfile=$filename.part - cmdline=("${cmdline[@]//%o/"$dlfile"}") + cmdline=("${cmdline[@]//%o/$dlfile}") fi # add the URL, either in place of %u or at the end if [[ ${cmdline[*]} = *%u* ]]; then - cmdline=("${cmdline[@]//%u/"$url"}") + cmdline=("${cmdline[@]//%u/$url}") else cmdline+=("$url") fi |