octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-12-02 03:18:18 +00:00
Code Issues Projects Releases Wiki Activity

adjust curl not found messages

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-11-29 09:40:45 +01:00
parent 0b64af7423
commit b4c83c141a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bashbot.sh
View File

@ -11,7 +11,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ v1.2-dev-24-gde31d77 #### $$VERSION$$ v1.2-dev-25-g0b64af7
# #
# Exit Codes: # Exit Codes:
# - 0 success (hopefully) # - 0 success (hopefully)
@ -385,16 +385,18 @@ get_file() {
printf '%s\n' "${URL}"/"$(JsonGetString <<< "${res}" '"result","file_path"')" printf '%s\n' "${URL}"/"$(JsonGetString <<< "${res}" '"result","file_path"')"
} }
# curl is preferred, but may not available on embedded systems # return TRUE if curl is found or custom curl detected
# return FALSE if no curl is found or wget is forced by BASHBOT_WGET
# sets BASHBOT_CURL to point to curl
function detect_curl() { function detect_curl() {
# custom curl command # custom curl command
[ -n "${BASHBOT_CURL}" ] && return 0 [ -n "${BASHBOT_CURL}" ] && return 0
# use wget # use wget
[ -n "${BASHBOT_WGET}" ] && return 1 [ -n "${BASHBOT_WGET}" ] && return 1
# default method # default use curl in PATH
BASHBOT_CURL="curl" BASHBOT_CURL="curl"
_exists curl && return 0 _exists curl && return 0
# look in usual locations # search in usual locations
local file local file
for file in /usr/bin /bin /usr/local/bin; do for file in /usr/bin /bin /usr/local/bin; do
if [ -x "${file}/curl" ]; then if [ -x "${file}/curl" ]; then
@ -402,7 +404,8 @@ function detect_curl() {
return 0 return 0
fi fi
done done
local warn="Warning: Curl not detected, trying wget as fallback!" # curl not in PATH and not in usual locations
local warn="Warning: Curl not detected, try fallback to wget! pls install curl or adjust BASHBOT_CURL/BASHBOT_WGET environment variables."
printf "%s: %s\n" "$(date)" "${warn}" >>"${UPDATELOG}" printf "%s: %s\n" "$(date)" "${warn}" >>"${UPDATELOG}"
[ -n "${BASHBOTDEBUG}" ] && printf "%s: %s\n" "$(date)" "${warn}" >>"${DEBUGLOG}" [ -n "${BASHBOTDEBUG}" ] && printf "%s: %s\n" "$(date)" "${warn}" >>"${DEBUGLOG}"
return 1 return 1
@ -410,7 +413,7 @@ function detect_curl() {
# iconv used to filter out broken utf characters, if not installed fake it # iconv used to filter out broken utf characters, if not installed fake it
if ! _exists iconv; then if ! _exists iconv; then
printf "%s: %s\n" "$(date)" "Warning: iconv not installed, pls imstall!" >>"${UPDATELOG}" printf "%s: %s\n" "$(date)" "Warning: iconv not installed, pls imstall iconv!" >>"${UPDATELOG}"
function iconv() { cat; } function iconv() { cat; }
fi fi