sendJson: factor out curl/wget, better log. fix git-add.sh

bashbot.sh

@@ -11,7 +11,7 @@
 # This file is public domain in the USA and all free countries.
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
-#### $$VERSION$$ v1.2-dev2-22-g2e24918
+#### $$VERSION$$ v1.2-dev2-23-g8379a62
 #
 # Exit Codes:
 # - 0 success (hopefully)
@@ -431,16 +431,8 @@ fi
 TIMEOUT="${BASHBOT_TIMEOUT}"
 [[ "$TIMEOUT" =~ ^[0-9]+$ ]] || TIMEOUT="20"
 
-if detect_curl ; then
+# usage: sendJson "chat" "JSON" "URL"
-  # here we have curl ----
+sendJson(){
-  [ -z "${BASHBOT_CURL}" ] && BASHBOT_CURL="curl"
-  getJson(){
-	[[ -n "${BASHBOTDEBUG}" && -n "${3}" ]] && printf "%s: getJson (curl) URL=%s\n" "$(date)" "${1##*/}" >>"${DEBUGLOG}"
-	# shellcheck disable=SC2086
-	"${BASHBOT_CURL}" -sL -k ${BASHBOT_CURL_ARGS} -m "${TIMEOUT}" "$1"
-  }
-  # usage: sendJson "chat" "JSON" "URL"
-  sendJson(){
 	local json chat=""
 	if [ -n "${1}" ]; then
 		 chat='"chat_id":'"${1}"','
@@ -449,14 +441,34 @@ if detect_curl ; then
 	json='{'"${chat} $(iconv -f utf-8 -t utf-8 -c <<<"$2")"'}'
 	if [ -n "${BASHBOTDEBUG}" ] ; then
 		printf "%s: sendJson (curl) CHAT=%s JSON=%s URL=%s\n" "$(date)" "${chat#*:}" "${2:0:100}" "${3##*/}" >>"${UPDATELOG}"
-		printf "=========== DEBUG sendJson ==========\n%s\n" "$("${JSONSHFILE}" -b -n <<<"${json}" 2>&1)" >>"${MESSAGELOG}"
+		printf "\n%s: DEBUG sendJson ==========\n%s\n" "$(date)" "$("${JSONSHFILE}" -b -n <<<"${json}" 2>&1)" >>"${MESSAGELOG}"
 	fi
-	[[ "${chat}" == *"NAN" ]] && return
+	[[ "${chat}" == *"NAN" ]] && return # not a number
-	# shellcheck disable=SC2086
+	# OK here we go ...
-	res="$("${BASHBOT_CURL}" -s -k ${BASHBOT_CURL_ARGS} -m "${TIMEOUT}"\
+	# route to curl/wget specific function
-		-d "${json}" -X POST "${3}" -H "Content-Type: application/json" | "${JSONSHFILE}" -b -n 2>/dev/null )"
+	res="$(sendJson_do "${json}" "${3}")"
+	# check telegram response
 	sendJsonResult "${res}" "sendJson (curl)" "$@"
 	[ -n "${BASHBOT_EVENT_SEND[*]}" ] && event_send "send" "${@}" &
+}
+
+#
+# curl / wget specific functions
+#
+if detect_curl ; then
+  # here we have curl ----
+  [ -z "${BASHBOT_CURL}" ] && BASHBOT_CURL="curl"
+  getJson(){
+	[[ -n "${BASHBOTDEBUG}" && -n "${3}" ]] && printf "%s: getJson (curl) URL=%s\n" "$(date)" "${1##*/}" >>"${DEBUGLOG}"
+	# shellcheck disable=SC2086
+	"${BASHBOT_CURL}" -sL -k ${BASHBOT_CURL_ARGS} -m "${TIMEOUT}" "$1"
+  }
+  # curl variant for sendJson
+  # usage: "JSON" "URL"
+  sendJson_do(){
+	# shellcheck disable=SC2086
+	"${BASHBOT_CURL}" -s -k ${BASHBOT_CURL_ARGS} -m "${TIMEOUT}"\
+		-d "${1}" -X POST "${2}" -H "Content-Type: application/json" | "${JSONSHFILE}" -b -n 2>/dev/null
   }
   #$1 Chat, $2 what, $3 file, $4 URL, $5 caption
   sendUpload() {
@@ -483,20 +495,12 @@ else
 	# shellcheck disable=SC2086
 	wget --no-check-certificate -t 2 -T "${TIMEOUT}" ${BASHBOT_WGET_ARGS} -qO - "$1"
     }
-    # usage: sendJson "chat" "JSON" "URL"
+    # curl variant for sendJson
-    sendJson(){
+    # usage: "JSON" "URL"
-	local json chat=""
+    sendJson_do(){
-	[ -n "${1}" ] && chat='"chat_id":'"${1}"','
-	json='{'"${chat} $(iconv -f utf-8 -t utf-8 -c <<<"$2")"'}'
-	if [ -n "${BASHBOTDEBUG}" ] ; then
-		printf "%s: sendJson (curl) CHAT=%s JSON=%s URL=%s\n" "$(date)" "${1}" "${2:0:100}" "${3##*/}" >>"${UPDATELOG}"
-		printf "=========== DEBUG sendJson ==========\n%s\n" "$("${JSONSHFILE}" -b -n <<<"${json}")" >>"${DEBUGLOG}"
-	fi
 	# shellcheck disable=SC2086
-	res="$(wget --no-check-certificate -t 2 -T "${TIMEOUT}" ${BASHBOT_WGET_ARGS} -qO - --post-data="${json}" \
+	wget --no-check-certificate -t 2 -T "${TIMEOUT}" ${BASHBOT_WGET_ARGS} -qO - --post-data="${1}" \
-		--header='Content-Type:application/json' "${3}" | "${JSONSHFILE}" -b -n 2>/dev/null )"
+		--header='Content-Type:application/json' "${2}" | "${JSONSHFILE}" -b -n 2>/dev/null
-	sendJsonResult "${res}" "sendJson (wget)" "$@"
-	[ -n "${BASHBOT_EVENT_SEND[*]}" ] && event_send "send" "${@}" & 
     }
     sendUpload() {
 	log_error "Sorry, wget does not support file upload"

dev/git-add.sh

@@ -3,7 +3,7 @@
 #
 # works together with git pre-push.sh and ADD all changed files since last push
 
-#### $$VERSION$$ v1.2-0-gc50499c
+#### $$VERSION$$ v1.2-dev2-23-g8379a62
 
 # magic to ensure that we're always inside the root of our application,
 # no matter from which directory we'll run script
@@ -16,7 +16,10 @@ fi
 
 [ ! -f .git/.lastpush ] && echo "No push or hooks not installed, use \"git add\" instead ... Abort" && exit
 
-FILES="$(find ./* -newer .git/.lastpush)"
+set +f
+FILES="$(find ./*  -newer .git/.lastpush| grep -v -e 'DIST\/' -e 'STANDALONE\/' -e 'JSON.sh')"
+set -f
+# FILES="$(find ./* -newer .git/.lastpush)"
 [ "${FILES}" = "" ] && echo "Noting changed since last push ... Abort" && exit
 
 # run pre_commit on files