Commit 4dba1a5d authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: fix get xz tarball

parent 2c755a03
...@@ -120,10 +120,10 @@ function get_targz() ...@@ -120,10 +120,10 @@ function get_targz()
function get_tarxz() function get_tarxz()
{ {
BIN7ZIP=/usr/bin/7z local BIN=/usr/bin/xz
test -x $BIN7ZIP || return test -x $BIN || return
get_archive tar.xz || return get_archive tar.xz || return
$BIN7ZIP x $WEXT.tar.xz && return $BIN -d $WEXT.tar.xz && return
rm -fv $WEXT.tar.xz rm -fv $WEXT.tar.xz
return 1 return 1
} }
...@@ -212,7 +212,7 @@ function get_source() ...@@ -212,7 +212,7 @@ function get_source()
# download GETSOURCE url to tar.bz2 or tar (set WEXT as without extension name) # download GETSOURCE url to tar.bz2 or tar (set WEXT as without extension name)
download_any_tarball() download_any_tarball()
{ {
get_tarbz2 || get_targz || get_tgz || get_7z || get_zip || get_tbz2 || get_tbz || get_tar || get_tarxz || get_rar || dir_name || fatal "Cannot retrieve $GETSOURCE" get_tarbz2 || get_targz || get_tgz || get_7z || get_zip || get_tbz2 || get_tbz || get_tarxz || get_rar || get_tar || dir_name || fatal "Cannot retrieve $GETSOURCE"
} }
# param: spec name number (f.i., url for Source-url) # param: spec name number (f.i., url for Source-url)
......
...@@ -103,6 +103,11 @@ copy_tarball_to_tar() ...@@ -103,6 +103,11 @@ copy_tarball_to_tar()
return return
fi fi
if [ ! ${SNAME/.tar.xz/} = "$SNAME" ] ; then
a= xz -d "$SNAME" > "$TNAME"
return
fi
if [ ! ${SNAME/.tgz/} = "$SNAME" ] ; then if [ ! ${SNAME/.tgz/} = "$SNAME" ] ; then
gunzip -c "$SNAME" > "$TNAME" gunzip -c "$SNAME" > "$TNAME"
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment