snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: do not hardcode unzip/xz path for extracting, assume it's in PATH.

This commit is contained in:
Juan RP 2010-11-17 02:46:08 +01:00
parent 4bc2a021e0
commit af284b261b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xbps-src/shutils/extract_funcs.sh
View File

@ -110,7 +110,7 @@ extract_distfiles()
case ${cursufx} in case ${cursufx} in
txz) txz)
if [ ! -x $XBPS_MASTERDIR/usr/bin/xz ]; then if ! command -v xz 2>&1 >/dev/null; then
msg_error "cannot find xz for extraction." msg_error "cannot find xz for extraction."
fi fi
tar xfJ $XBPS_SRCDISTDIR/$curfile -C $extractdir tar xfJ $XBPS_SRCDISTDIR/$curfile -C $extractdir
@ -145,9 +145,8 @@ extract_distfiles()
fi fi
;; ;;
zip) zip)
if [ -x $XBPS_MASTERDIR/usr/bin/unzip ]; then if command -v unzip 2>&1 >/dev/null; then
$XBPS_MASTERDIR/usr/bin/unzip \ unzip -q -x $XBPS_SRCDISTDIR/$curfile \
-q -x $XBPS_SRCDISTDIR/$curfile \
-d $extractdir -d $extractdir
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "extracting $curfile into $XBPS_BUILDDIR." msg_error "extracting $curfile into $XBPS_BUILDDIR."