Commit faa7beda authored by Vitaly Lipatov's avatar Vitaly Lipatov

eget: fix making file url from site url and filename

parent daddc8d1
...@@ -345,6 +345,16 @@ is_url() ...@@ -345,6 +345,16 @@ is_url()
echo "$1" | grep -q "://" echo "$1" | grep -q "://"
} }
# Args: URL filename
make_fileurl()
{
local url="$1"
local fn="$2"
fn="$(echo "$fn" | sed -e 's|^./||' -e 's|^/+||')"
# workaround for a slash in the end of URL
echo "$(echo "$url" | sed -e 's|/*$||')/$fn"
}
get_urls() get_urls()
{ {
# cat html, divide to lines by tags and cut off hrefs only # cat html, divide to lines by tags and cut off hrefs only
...@@ -355,15 +365,14 @@ get_urls() ...@@ -355,15 +365,14 @@ get_urls()
if [ -n "$LISTONLY" ] ; then if [ -n "$LISTONLY" ] ; then
for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do
is_url "$fn" && echo $fn && continue is_url "$fn" && echo $fn && continue
fn="$(echo "$fn" | sed -e 's|^./||' -e 's|^/+||')" make_fileurl "$URL" "$fn"
echo "$URL/$fn"
done done
exit exit
fi fi
ERROR=0 ERROR=0
for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do
is_url "$fn" || fn="$URL/$(basename "$fn")" is_url "$fn" || fn="$(make_fileurl "$URL" "$(basename "$fn")" )" #"
sget "$fn" || ERROR=1 sget "$fn" || ERROR=1
done done
exit $ERROR exit $ERROR
......
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