bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: quote filenames when extracting

Browse source 
We currently fall apart on files with spaces in the names.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dan McGee 2009-07-01 02:26:27 -05:00 • committed by Allan McRae
parent 8d7764abae
commit 68c10690ea
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

@ -644,13 +644,13 @@ extract_sources() {
local cmd='' local cmd=''
case "$file_type" in case "$file_type" in
*application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*)
cmd="bsdtar -x -f $file" ;; cmd="bsdtar -x -f" ;;
*application/x-gzip*) *application/x-gzip*)
cmd="gunzip -d -f $file" ;; cmd="gunzip -d -f" ;;
*application/x-bzip*) *application/x-bzip*)
cmd="bunzip2 -f $file" ;; cmd="bunzip2 -f" ;;
*application/x-xz*) *application/x-xz*)
cmd="xz -d -f $file" ;; cmd="xz -d -f" ;;
*) *)
# Don't know what to use to extract this file, # Don't know what to use to extract this file,
# skip to the next file # skip to the next file
@ -658,8 +658,8 @@ extract_sources() {
esac esac
local ret=0 local ret=0
msg2 "$cmd" msg2 "$cmd \"$file\""
$cmd || ret=$? $cmd "$file" || ret=$?
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
error "$(gettext "Failed to extract %s")" "$file" error "$(gettext "Failed to extract %s")" "$file"
plain "$(gettext "Aborting...")" plain "$(gettext "Aborting...")"