Commit 65b48c0b authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: if tarball is not tar, try download it firstly

parent b16e320e
...@@ -69,14 +69,21 @@ download_any_tarball() ...@@ -69,14 +69,21 @@ download_any_tarball()
{ {
local GETSOURCE="$1" local GETSOURCE="$1"
local TARGET="$2" local TARGET="$2"
local ext
local FORMATS="tar.xz tar.bz2 tar.gz zip tgz 7z tbz2 tbz rar tar" local FORMATS="tar.xz tar.bz2 tar.gz zip tgz 7z tbz2 tbz rar tar"
local BASESOURCE="$GETSOURCE" local BASESOURCE="$GETSOURCE"
# drop any ext
for ext in $FORMATS ; do local ORIGEXT=$(rhas "$BASESOURCE" "\." && echo "$BASESOURCE" | sed -e "s|.*\.||")
BASESOURCE=$(echo "$BASESOURCE" | sed -e "s|\.$ext$||g") [ -n "$ORIGEXT" ] || fatal "Have no idea how to load files without extension"
done
# try download with some ext # first try download with original extension (exclude for tar)
if [ "$ORIGEXT" != "tar" ] ; then
FORMATS="$ORIGEXT $(estrlist exclude "$ORIGEXT" "$FORMATS")"
fi
BASESOURCE=$(echo "$BASESOURCE" | sed -e "s|\.$ORIGEXT$||g")
local ext
# try download by exts list
for ext in $FORMATS ; do for ext in $FORMATS ; do
[ -n "$FORCEDOWNLOAD" ] && docmd rm -f "$BASESOURCE.$ext" [ -n "$FORCEDOWNLOAD" ] && docmd rm -f "$BASESOURCE.$ext"
download_url "$BASESOURCE.$ext" || continue download_url "$BASESOURCE.$ext" || continue
...@@ -105,6 +112,7 @@ function source_ext() ...@@ -105,6 +112,7 @@ function source_ext()
GETSOURCEEXT=$(eval_spec "$TMPSPEC" | get_var "Summary") GETSOURCEEXT=$(eval_spec "$TMPSPEC" | get_var "Summary")
rm -f "$TMPSPEC" rm -f "$TMPSPEC"
fi fi
echo "$GETSOURCEEXT" echo "$GETSOURCEEXT"
test -n "$GETSOURCEEXT" test -n "$GETSOURCEEXT"
} }
......
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