Skip to content

Commit

Permalink
Merge branch 'acmesh-official:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Eagle3386 authored Jul 30, 2023
2 parents 80006f4 + 0da839c commit 66a68ed
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/DragonFlyBSD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
nat: |
"8080": "80"
prepare: |
pkg install -y curl socat
pkg install -y curl socat libnghttp2
usesh: true
run: |
cd ../acmetest \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OpenBSD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
nat: |
"8080": "80"
prepare: pkg_add socat curl wget
prepare: pkg_add socat curl wget libnghttp2
usesh: true
copyback: false
run: |
Expand Down
25 changes: 22 additions & 3 deletions acme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -923,8 +923,16 @@ _sed_i() {
fi
}

if [ "$(echo abc | egrep -o b 2>/dev/null)" = "b" ]; then
__USE_EGREP=1
else
__USE_EGREP=""
fi

_egrep_o() {
if ! egrep -o "$1" 2>/dev/null; then
if [ "$__USE_EGREP" ]; then
egrep -o "$1"
else
sed -n 's/.*\('"$1"'\).*/\1/p'
fi
}
Expand Down Expand Up @@ -2101,9 +2109,20 @@ _head_n() {
}

_tail_n() {
if ! tail -n "$1" 2>/dev/null; then
if _is_solaris; then
#fix for solaris
tail -"$1"
else
tail -n "$1"
fi
}

_tail_c() {
if _is_solaris; then
#fix for solaris
tail -"$1"c
else
tail -c "$1"
fi
}

Expand Down Expand Up @@ -2278,7 +2297,7 @@ _setopt() {
if [ ! -f "$__conf" ]; then
touch "$__conf"
fi
if [ -n "$(tail -c1 <"$__conf")" ]; then
if [ -n "$(_tail_c 1 <"$__conf")" ]; then
echo >>"$__conf"
fi

Expand Down
4 changes: 2 additions & 2 deletions dnsapi/dns_kappernet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dns_kappernet_add() {
if _kappernet_api GET "action=new&subject=$_domain&data=$data"; then

if _contains "$response" "{\"OK\":true"; then
_info "Waiting 120 seconds for DNS to spread the new record"
_sleep 120
_info "Waiting 1 second for DNS to spread the new record"
_sleep 1
return 0
else
_err "Error creating a TXT DNS Record: $fullhostname TXT $txtvalue"
Expand Down
1 change: 1 addition & 0 deletions notify/aws_ses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ aws_ses_send() {
_err "Please specify your region and try again. see https://docs.aws.amazon.com/general/latest/gr/ses.html"
return 1
fi
_saveaccountconf_mutable AWS_SES_REGION "$AWS_SES_REGION"

#save for future use, unless using a role which will be fetched as needed
if [ -z "$_using_role" ]; then
Expand Down

0 comments on commit 66a68ed

Please sign in to comment.