Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work around bug in _egrep_o() function #2434

Merged
merged 4 commits into from
Oct 10, 2019
Merged

Work around bug in _egrep_o() function #2434

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae66c6f
Fix bug (in egrep regex) reported by @maks2018 in issue 2305
dkerr64 Jul 11, 2019
2ce9fb9
Work around bug in _egrep_o() function
dkerr64 Jul 11, 2019
9826b8a
Merge branch 'dev' of https://github.com/Neilpang/acme.sh into FreeDNS
dkerr64 Aug 10, 2019
0b2b8b9
Replace grep -o with sed
dkerr64 Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dnsapi/dns_freedns.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ _freedns_domain_id() {

domain_id="$(echo "$htmlpage" | tr -d "[:space:]" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
| grep "<td>$search_domain</td>\|<td>$search_domain(.*)</td>" \
| _egrep_o "edit\.php\?edit_domain_id=[0-9a-zA-Z]+" \
| sed -n 's/.*\(edit\.php?edit_domain_id=[0-9a-zA-Z]*\).*/\1/p' \
| cut -d = -f 2)"
# The above beauty extracts domain ID from the html page...
# strip out all blank space and new lines. Then insert newlines
Expand Down Expand Up @@ -352,7 +352,7 @@ _freedns_data_id() {
data_id="$(echo "$htmlpage" | tr -d "[:space:]" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
| grep "<td[a-zA-Z=#]*>$record_type</td>" \
| grep "<ahref.*>$search_domain</a>" \
| _egrep_o "edit\.php\?data_id=[0-9a-zA-Z]+" \
| sed -n 's/.*\(edit\.php?data_id=[0-9a-zA-Z]*\).*/\1/p' \
| cut -d = -f 2)"
# The above beauty extracts data ID from the html page...
# strip out all blank space and new lines. Then insert newlines
Expand Down