pck-update (-a0): fully support generic regexpr
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
parent
041719d96e
commit
2f6bd17716
@ -31,9 +31,9 @@ function repository.is_reachable() {
|
|||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
# function repository.get_pckname_from_HTML()
|
# function repository.get_srpm_pckname_from_HTML()
|
||||||
# ... ADDME ...
|
# ... ADDME ...
|
||||||
function repository.get_pckname_from_HTML() {
|
function repository.get_srpm_pckname_from_HTML() {
|
||||||
local pck_name="$1"
|
local pck_name="$1"
|
||||||
local infile="$2"
|
local infile="$2"
|
||||||
|
|
||||||
@ -48,13 +48,17 @@ function repository.get_pckname_from_HTML() {
|
|||||||
|
|
||||||
notify.debug "$FUNCNAME: infile = \"$infile\""
|
notify.debug "$FUNCNAME: infile = \"$infile\""
|
||||||
|
|
||||||
|
local regexpr
|
||||||
|
[[ "$pck_name" =~ ^[a-zA-Z0-9-]+$ ]] && \
|
||||||
|
regexpr="^$pck_name-[^-]\+-[^-]\+$" || regexpr="$pck_name"
|
||||||
|
|
||||||
local pckname_from_HTML=( $(sed -n "\
|
local pckname_from_HTML=( $(sed -n "\
|
||||||
# remove HTML tags --> get a better input
|
# remove HTML tags --> get a better input
|
||||||
/<a href=\"/{s|.*<a href=\"\([^\"]*\)\".*|\1|;bm;};
|
/<a href=\".*\.src\.rpm\"/{s|.*<a href=\"\([^\"]*\)\".*|\1|;bm;};
|
||||||
/<A HREF=\"/{s|.*<A HREF=\"\([^\"]*\)\".*|\1|;bm;};
|
/<A HREF=\".*\.src\.rpm\"/{s|.*<A HREF=\"\([^\"]*\)\".*|\1|;bm;};
|
||||||
# exit loop if the line do not match the following regexpr
|
# exit loop (skip print) if the line do not match regexpr
|
||||||
/^$pck_name-[^-]\+-[^-]\+$/bm;be;
|
/$regexpr/bm;be;
|
||||||
:m;/^$pck_name-[^-]\+-[^-]\+$/p;:e" $infile) )
|
:m;/$regexpr/p;:e" $infile) )
|
||||||
|
|
||||||
echo "${pckname_from_HTML[*]}"
|
echo "${pckname_from_HTML[*]}"
|
||||||
}
|
}
|
||||||
@ -219,7 +223,7 @@ getting list of files from"" \`${NOTE}$currurl/${NORM}'..."
|
|||||||
|
|
||||||
if [ -s "${flist[$i]}" ]; then
|
if [ -s "${flist[$i]}" ]; then
|
||||||
got_SPEC_FILENAME=($(\
|
got_SPEC_FILENAME=($(\
|
||||||
repository.get_pckname_from_HTML "$pck_name" "${flist[$i]}"))
|
repository.get_srpm_pckname_from_HTML "$pck_name" "${flist[$i]}"))
|
||||||
|
|
||||||
[ "$got_SPEC_FILENAME" ] &&
|
[ "$got_SPEC_FILENAME" ] &&
|
||||||
{ notify.debug "\
|
{ notify.debug "\
|
||||||
|
Loading…
Reference in New Issue
Block a user