From 98ef51514f59da72fcb8f4f2c2be563252c77848 Mon Sep 17 00:00:00 2001
From: ciro <ciro.perezjr@gmail.com>
Date: Sun, 11 Jul 2021 20:29:44 -0300
Subject: [PATCH 1/6] added pushbullet functionality

---
 notify/pushbullet.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 notify/pushbullet.sh

diff --git a/notify/pushbullet.sh b/notify/pushbullet.sh
new file mode 100644
index 00000000..44461d25
--- /dev/null
+++ b/notify/pushbullet.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env sh
+
+#Support for pushbullet.com's api. Push notification, notification sync and message platform for multiple platforms
+#PUSHBULLET_TOKEN="" Required, pushbullet application token
+#PUSHBULLET_DEVICE="" Optional, Specific device, ignore to send to all devices
+
+PUSHBULLET_URI="https://api.pushbullet.com/v2/pushes"
+pushbullet_send() {
+    _subject="$1"
+    _content="$2"
+    _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
+    _debug "_statusCode" "$_statusCode"
+
+    PUSHBULLET_TOKEN="${PUSHBULLET_TOKEN:-$(_readaccountconf_mutable PUSHBULLET_TOKEN)}"
+    if [ -z "$PUSHBULLET_TOKEN" ]; then
+        PUSHBULLET_TOKEN=""
+        _err "You didn't specify a Pushbullet application token yet."
+        return 1
+    fi
+    _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
+
+    PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
+    if [ -z "$PUSHBULLET_DEVICE" ]; then
+        _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
+    fi
+
+    export _H1="Content-Type: application/json"
+    export _H2="Access-Token: ${PUSHBULLET_TOKEN}"
+    _content="$(printf "*%s*\n" "$_content" | _json_encode)"
+    _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
+    _data="{\"type\": \"note\",\"title\": \"${_subject}\",\"body\": \"${_content}\",\"device_iden\": \"${PUSHBULLET_DEVICE}\"}"
+    response="$(_post "$_data" "$PUSHBULLET_URI")"
+
+    if [ "$?" != "0" ] || _contains "$response" "\"error_code\""; then
+        _err "PUSHBULLET send error."
+        _err "$response"
+        return 1
+    fi
+
+    _info "PUSHBULLET send success."
+    return 0
+}

From c7ca9d7e36a2a240a5a25f60d3e7f9d9daefc3b2 Mon Sep 17 00:00:00 2001
From: ciro <ciro.perezjr@gmail.com>
Date: Thu, 15 Jul 2021 22:55:35 -0300
Subject: [PATCH 2/6] fix shfmt issues

---
 notify/pushbullet.sh | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/notify/pushbullet.sh b/notify/pushbullet.sh
index 44461d25..0a638745 100644
--- a/notify/pushbullet.sh
+++ b/notify/pushbullet.sh
@@ -6,37 +6,37 @@
 
 PUSHBULLET_URI="https://api.pushbullet.com/v2/pushes"
 pushbullet_send() {
-    _subject="$1"
-    _content="$2"
-    _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-    _debug "_statusCode" "$_statusCode"
+  _subject="$1"
+  _content="$2"
+  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
+  _debug "_statusCode" "$_statusCode"
 
-    PUSHBULLET_TOKEN="${PUSHBULLET_TOKEN:-$(_readaccountconf_mutable PUSHBULLET_TOKEN)}"
-    if [ -z "$PUSHBULLET_TOKEN" ]; then
-        PUSHBULLET_TOKEN=""
-        _err "You didn't specify a Pushbullet application token yet."
-        return 1
-    fi
+  PUSHBULLET_TOKEN="${PUSHBULLET_TOKEN:-$(_readaccountconf_mutable PUSHBULLET_TOKEN)}"
+  if [ -z "$PUSHBULLET_TOKEN" ]; then
+    PUSHBULLET_TOKEN=""
+    _err "You didn't specify a Pushbullet application token yet."
+    return 1
+  fi
+  _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
+
+  PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
+  if [ -z "$PUSHBULLET_DEVICE" ]; then
     _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
+  fi
 
-    PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
-    if [ -z "$PUSHBULLET_DEVICE" ]; then
-        _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
-    fi
+  export _H1="Content-Type: application/json"
+  export _H2="Access-Token: ${PUSHBULLET_TOKEN}"
+  _content="$(printf "*%s*\n" "$_content" | _json_encode)"
+  _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
+  _data="{\"type\": \"note\",\"title\": \"${_subject}\",\"body\": \"${_content}\",\"device_iden\": \"${PUSHBULLET_DEVICE}\"}"
+  response="$(_post "$_data" "$PUSHBULLET_URI")"
 
-    export _H1="Content-Type: application/json"
-    export _H2="Access-Token: ${PUSHBULLET_TOKEN}"
-    _content="$(printf "*%s*\n" "$_content" | _json_encode)"
-    _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
-    _data="{\"type\": \"note\",\"title\": \"${_subject}\",\"body\": \"${_content}\",\"device_iden\": \"${PUSHBULLET_DEVICE}\"}"
-    response="$(_post "$_data" "$PUSHBULLET_URI")"
+  if [ "$?" != "0" ] || _contains "$response" "\"error_code\""; then
+    _err "PUSHBULLET send error."
+    _err "$response"
+    return 1
+  fi
 
-    if [ "$?" != "0" ] || _contains "$response" "\"error_code\""; then
-        _err "PUSHBULLET send error."
-        _err "$response"
-        return 1
-    fi
-
-    _info "PUSHBULLET send success."
-    return 0
+  _info "PUSHBULLET send success."
+  return 0
 }

From 4a8511f68009826f0b56302df3e9faff3a64106c Mon Sep 17 00:00:00 2001
From: ciro <ciro.perezjr@gmail.com>
Date: Sat, 17 Jul 2021 13:50:45 -0300
Subject: [PATCH 3/6] fix wrong variable name

---
 notify/pushbullet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notify/pushbullet.sh b/notify/pushbullet.sh
index 0a638745..6f33b44f 100644
--- a/notify/pushbullet.sh
+++ b/notify/pushbullet.sh
@@ -21,7 +21,7 @@ pushbullet_send() {
 
   PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
   if [ -z "$PUSHBULLET_DEVICE" ]; then
-    _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
+    _saveaccountconf_mutable PUSHBULLET_DEVICE "$PUSHBULLET_DEVICE"
   fi
 
   export _H1="Content-Type: application/json"

From 83cb89e4f741b0d160cd9776e625d6d17e3b5af6 Mon Sep 17 00:00:00 2001
From: Aleksei Faians <af.git@bsrealm.net>
Date: Tue, 17 Aug 2021 08:58:04 +0300
Subject: [PATCH 4/6] treat variable contents as text, don't process switches

---
 dnsapi/dns_he.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_he.sh b/dnsapi/dns_he.sh
index ef09fa0a..bf4a5030 100755
--- a/dnsapi/dns_he.sh
+++ b/dnsapi/dns_he.sh
@@ -85,7 +85,7 @@ dns_he_rm() {
     _debug "The txt record is not found, just skip"
     return 0
   fi
-  _record_id="$(echo "$response" | tr -d "#" | sed "s/<tr/#<tr/g" | tr -d "\n" | tr "#" "\n" | grep "$_full_domain" | grep '"dns_tr"' | grep "$_txt_value" | cut -d '"' -f 4)"
+  _record_id="$(echo "$response" | tr -d "#" | sed "s/<tr/#<tr/g" | tr -d "\n" | tr "#" "\n" | grep "$_full_domain" | grep '"dns_tr"' | grep -- "$_txt_value" | cut -d '"' -f 4)"
   _debug2 _record_id "$_record_id"
   if [ -z "$_record_id" ]; then
     _err "Can not find record id"

From 20f604948f943feca26b595fbeb21795c79e1a01 Mon Sep 17 00:00:00 2001
From: neil <github@neilpang.com>
Date: Sun, 3 Oct 2021 22:31:56 +0800
Subject: [PATCH 5/6] Update pushbullet.sh

---
 notify/pushbullet.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/notify/pushbullet.sh b/notify/pushbullet.sh
index 6f33b44f..76606c86 100644
--- a/notify/pushbullet.sh
+++ b/notify/pushbullet.sh
@@ -20,7 +20,9 @@ pushbullet_send() {
   _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
 
   PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
-  if [ -z "$PUSHBULLET_DEVICE" ]; then
+  if [ -z "$PUSHBULLET_DEVICE" ]; then 
+    _clearaccountconf_mutable PUSHBULLET_DEVICE
+  else
     _saveaccountconf_mutable PUSHBULLET_DEVICE "$PUSHBULLET_DEVICE"
   fi
 

From f2958818c8ae1bb0f915d8418247802af2ac970e Mon Sep 17 00:00:00 2001
From: neil <github@neilpang.com>
Date: Sun, 3 Oct 2021 22:33:41 +0800
Subject: [PATCH 6/6] Update pushbullet.sh

---
 notify/pushbullet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notify/pushbullet.sh b/notify/pushbullet.sh
index 76606c86..ca997c84 100644
--- a/notify/pushbullet.sh
+++ b/notify/pushbullet.sh
@@ -20,7 +20,7 @@ pushbullet_send() {
   _saveaccountconf_mutable PUSHBULLET_TOKEN "$PUSHBULLET_TOKEN"
 
   PUSHBULLET_DEVICE="${PUSHBULLET_DEVICE:-$(_readaccountconf_mutable PUSHBULLET_DEVICE)}"
-  if [ -z "$PUSHBULLET_DEVICE" ]; then 
+  if [ -z "$PUSHBULLET_DEVICE" ]; then
     _clearaccountconf_mutable PUSHBULLET_DEVICE
   else
     _saveaccountconf_mutable PUSHBULLET_DEVICE "$PUSHBULLET_DEVICE"