octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2025-01-16 02:42:19 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-06-25 13:32:36 +02:00
parent d904371fb9
commit af156a4e1b
2 changed files with 2 additions and 8 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. # 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$$ v0.98-dev-73-ge7739b8 #### $$VERSION$$ v0.98-dev-70-g694ee61
# #
# Exit Codes: # Exit Codes:
# - 0 success (hopefully) # - 0 success (hopefully)
@ -847,14 +847,8 @@ process_message() {
declare -A BASHBOTBLOCKED declare -A BASHBOTBLOCKED
export BASHBOTDEBUG export BASHBOTDEBUG
start_bot() { start_bot() {
<<<<<<< HEAD
local DEBUG="$1"
local OFFSET=0
# adaptive sleep deafults
=======
local ADMIN OFFSET=0 local ADMIN OFFSET=0
# adaptive sleep defaults # adaptive sleep defaults
>>>>>>> develop
local nextsleep="100" local nextsleep="100"
local stepsleep="${BASHBOT_SLEEP_STEP:-100}" local stepsleep="${BASHBOT_SLEEP_STEP:-100}"
local maxsleep="${BASHBOT_SLEEP:-5000}" local maxsleep="${BASHBOT_SLEEP:-5000}"

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

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