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

FS7485: Replace tar/cpio/unzip with bsdtar for extracting/creating packages.

Browse Source 
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
This commit is contained in:
Baptiste Daroussin 2007-06-22 19:23:28 +01:00 committed by Dan McGee
parent 5a3b595837
commit 24c41f5190
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/makepkg.in
View File

@ -565,7 +565,6 @@ extract_sources() {
msg "$(gettext "Extracting Sources...")"
local netfile
for netfile in "${source[@]}"; do
unziphack=0
file=$(strip_url "$netfile")
if in_array "$file" ${noextract[@]}; then
#skip source files in the noextract=() array
@ -577,14 +576,7 @@ extract_sources() {
local file_type=$(file -biz "$file")
local cmd=''
case "$file_type" in
*application/x-tar*application/x-compress*)
cmd="tar -xzf $file" ;;
*application/x-tar*)
cmd="tar -xf $file" ;;
*application/x-zip*)
unziphack=1
cmd="unzip -qqo $file" ;;
*application/x-cpio*)
*application/x-tar*|*application/x-zip*|*application/x-cpio*)
cmd="bsdtar -x -f $file" ;;
*application/x-gzip*)
cmd="gunzip -d -f $file" ;;
@ -600,12 +592,8 @@ extract_sources() {
msg2 "$cmd"
$cmd || ret=$?
if [ $ret -ne 0 ]; then
# unzip will return a 1 as a warning, it is not an error
if [ $unziphack -ne 1 -o $ret -ne 1 ]; then
error "$(gettext "Failed to extract %s")" "$file"
plain "$(gettext "Aborting...")"
exit 1
fi
error "$(gettext "Failed to extract %s")" "$file"
plain "$(gettext "Aborting...")"
fi
done
@ -823,7 +811,7 @@ create_package() {
local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
comp_files="$comp_files .PKGINFO .FILELIST"
if ! tar -czf "$pkg_file" $comp_files $(ls); then
if ! bsdtar -czf "$pkg_file" $comp_files $(ls); then
error "$(gettext "Failed to create package file.")"
exit 1 # TODO: error code
fi
@ -914,7 +902,7 @@ create_srcpackage() {
# tar it up
msg2 "$(gettext "Compressing source package...")"
if ! tar -czf "$pkg_file" $comp_files; then
if ! bsdtar -czf "$pkg_file" $comp_files; then
error "$(gettext "Failed to create source package file.")"
exit 1 # TODO: error code
fi