octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-11-26 09:16:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #137 0.98 pre 2

Browse Source 
0.98 pre 2
This commit is contained in:
Kay Marquardt 2020-06-25 15:54:58 +02:00 committed by GitHub
commit 18065b119e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bashbot.sh
View File

@ -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$$ v0.98-dev-73-ge7739b8
#### $$VERSION$$ v0.98-dev-70-g694ee61
#
# Exit Codes:
# - 0 success (hopefully)
@ -847,14 +847,8 @@ process_message() {
declare -A BASHBOTBLOCKED
export BASHBOTDEBUG
start_bot() {
<<<<<<< HEAD
local DEBUG="$1"
local OFFSET=0
# adaptive sleep deafults
=======
local ADMIN OFFSET=0
# adaptive sleep defaults
>>>>>>> develop
local nextsleep="100"
local stepsleep="${BASHBOT_SLEEP_STEP:-100}"
local maxsleep="${BASHBOT_SLEEP:-5000}"

2
dev/hooks/pre-commit.sh
View File

@ -43,7 +43,7 @@ else
fi
REMOTEVER="$(git ls-remote -t --refs 2>/dev/null | tail -1 | sed -e 's/.*\/v//' -e 's/-.*//')"
VERSION="$(git describe --tags | sed -e 's/-.*//' -e 's/v//')"
VERSION="$(git describe --tags | sed -e 's/-.*//' -e 's/v//' -e 's/,/./')"
# LOCAL version must greater than latest REMOTE release version

4
modules/jsonDB.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
#
#### $$VERSION$$ v0.98-dev-74-g3d760b3
#### $$VERSION$$ v0.98-pre-1-gea92c55
#
# source from commands.sh to use jsonDB functions
#
@ -332,7 +332,7 @@ function jssh_updateArray_async() {
# $1 ARRAY name, must be declared with "declare -A ARRAY" before calling
Json2Array() {
# shellcheck disable=SC1091,SC1090
[ -z "$1" ] || source <( printf "$1"'=( %s )' "$(sed -E -n -e '/\["[-0-9a-zA-Z_,."]+"\]\+*\t/ s/\t/=/gp' -e 's/=(true|false)/="\1"/')" )
[ -z "$1" ] || source <( printf "$1"'=( %s )' "$(sed -E -n -e ':x /"text"\]/ { N; s/([^"])\n/\1\\n/g ; tx }' -e '/\["[-0-9a-zA-Z_,."]+"\]\+*\t/ s/\t/=/gp' -e 's/=(true|false)/="\1"/')" )
}
# get Config Key from jssh file without jsshDB
# output ARRAY as JSON.sh style data