Skip to content
Permalink
Browse files

fix notify message

  • Loading branch information...
neilpang
neilpang committed Aug 5, 2019
1 parent d74dfb1 commit 143eac092ce8b8fe7c068809449ce7a5b71f3ea2
Showing with 21 additions and 20 deletions.
  1. +3 −2 acme.sh
  2. +6 −6 notify/ifttt.sh
  3. +6 −6 notify/pushover.sh
  4. +6 −6 notify/sendgrid.sh
@@ -5932,7 +5932,8 @@ _send_notify() {
_send_err=0
for _n_hook in $(echo "$_nhooks" | tr ',' " "); do
_n_hook_file="$(_findHook "" $_SUB_FOLDER_NOTIFY "$_n_hook")"
_info "Found $_n_hook_file for $_n_hook"
_info "Sending via: $_n_hook"
_debug "Found $_n_hook_file for $_n_hook"
if [ -z "$_n_hook_file" ]; then
_err "Can not find the hook file for $_n_hook"
continue
@@ -5971,7 +5972,7 @@ _set_notify_hook() {
_nhooks="$1"

_test_subject="Hello, this is notification from $PROJECT_NAME"
_test_content="If you receive this email, your notification works."
_test_content="If you receive this message, your notification works."

_send_notify "$_test_subject" "$_test_content" "$_nhooks" 0

@@ -73,13 +73,13 @@ ifttt_send() {
_subject=$(echo "$_subject" | _json_encode)
_data="{\"$IFTTT_SUBJECT_KEY\": \"$_subject\", \"$IFTTT_CONTENT_KEY\": \"$_content\"}"

response="" #just make shellcheck happy
if _post "$_data" "$IFTTT_API_URL" "" "POST" "application/json"; then
if _contains "$response" "Congratulations"; then
_info "IFTTT webhooks event fired success."
return 0
fi
response="$(_post "$_data" "$IFTTT_API_URL" "" "POST" "application/json")"

if [ "$?" = "0" ] && _contains "$response" "Congratulations"; then
_info "IFTTT webhooks event fired success."
return 0
fi

_err "IFTTT webhooks event fired error."
_err "$response"
return 1
@@ -50,13 +50,13 @@ pushover_send() {
_subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
_data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}"

response="" #just make shellcheck happy
if _post "$_data" "$PUSHOVER_URI"; then
if _contains "$response" "{\"status\":1"; then
_info "PUSHOVER send success."
return 0
fi
response="$(_post "$_data" "$PUSHOVER_URI")"

if [ "$?" = "0" ] && _contains "$response" "{\"status\":1"; then
_info "PUSHOVER send success."
return 0
fi

_err "PUSHOVER send error."
_err "$response"
return 1
@@ -42,13 +42,13 @@ sendgrid_send() {

_content="$(echo "$_content" | _json_encode)"
_data="{\"personalizations\": [{\"to\": [{\"email\": \"$SENDGRID_TO\"}]}],\"from\": {\"email\": \"$SENDGRID_FROM\"},\"subject\": \"$_subject\",\"content\": [{\"type\": \"text/plain\", \"value\": \"$_content\"}]}"
response="" #just make shellcheck happy
if _post "$_data" "https://api.sendgrid.com/v3/mail/send"; then
if [ -z "$response" ]; then
_info "sendgrid send sccess."
return 0
fi
response="$(_post "$_data" "https://api.sendgrid.com/v3/mail/send")"

if [ "$?" = "0" ] && [ -z "$response" ]; then
_info "sendgrid send sccess."
return 0
fi

_err "sendgrid send error."
_err "$response"
return 1

0 comments on commit 143eac0

Please sign in to comment.
You can’t perform that action at this time.