diff options
| author | Allan McRae <allan@archlinux.org> | 2009-07-11 17:07:46 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2009-07-11 17:17:25 +0200 |
| commit | 104daa16a69708c9b16fc59ac895f2932ea509d4 (patch) | |
| tree | aa4f0ee3d337506d379f7dc750bd08efb130c88d | |
| parent | caa0f2205a62344c4df6e286e14a0d89cd1d10f2 (diff) | |
| download | pacman-104daa16a69708c9b16fc59ac895f2932ea509d4.tar.gz pacman-104daa16a69708c9b16fc59ac895f2932ea509d4.tar.xz | |
makepkg: allow spaces in source file names
The download command failed with sources that contained spaces.
Remainder of fix for FS#15323.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b80ff5ab..8998e0da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -323,17 +323,17 @@ download_file() { # replace %o by the temporary dlfile if it exists if echo "$dlcmd" | grep -q "%o" ; then - dlcmd=${dlcmd//\%o/$file.part} + dlcmd=${dlcmd//\%o/\"$file.part\"} dlfile="$file.part" fi # add the url, either in place of %u or at the end if echo "$dlcmd" | grep -q "%u" ; then - dlcmd=${dlcmd//\%u/$url} + dlcmd=${dlcmd//\%u/\"$url\"} else - dlcmd="$dlcmd $url" + dlcmd="$dlcmd \"$url\"" fi - $dlcmd || return $? + eval $dlcmd || return $? # rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then |