From 4fd6f98f7789380c643db4a98da234221043a004 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Tue, 9 Jun 2020 16:51:50 +0200
Subject: [PATCH] do not start timer by default

---
 README.html         |  4 ++--
 README.md           |  4 ++--
 README.txt          |  6 +++---
 bashbot.sh          | 12 +++++-------
 mycommands.sh       | 15 +++++++++++++--
 mycommands.sh.clean | 14 ++++++++++++--
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/README.html b/README.html
index 5b81f09..703421c 100644
--- a/README.html
+++ b/README.html
@@ -92,7 +92,7 @@ Written by Drew (@topkecleon), Daniil Gentili (@danogentili), and Kay M (@gnadel
 <h2>Prerequisites</h2>
 <p>Uses <a href="http://github.com/dominictarr/JSON.sh">JSON.sh</a>, but no more TMUX.</p>
 <p>Even bashbot is written in bash, it depends on commands typically availible in a Unix/Linux Environment. More concret on the common commands provided by recent versions of <a href="https://en.wikipedia.org/wiki/List_of_GNU_Core_Utilities_commands">coreutils</a>, <a href="https://en.wikipedia.org/wiki/BusyBox#Commands">busybox</a> or <a href="https://landley.net/toybox/help.html">toybox</a>, see <a href="doc/7_develop.md#common-commands">Developer Notes</a></p>
-<p><em>Note for MacOS and BSD Users:</em> As bashbot use behavior of recent bash and (gnu)sed versions, bashbot may not run without installing additional software, see <a href="doc/0_install.md">Install Bashbot</a></p>
+<p><em>Note for MacOS and BSD Users:</em> As bashbot heavily uses modern bash and (gnu) grep/sed features, bashbot will not run without installing additional software, see <a href="doc/0_install.md">Install Bashbot</a></p>
 <p>Bashbot <a href="https://github.com/topkecleon/telegram-bot-bash">Documentation</a> and <a href="https://github.com/topkecleon/telegram-bot-bash/releases">Downloads</a> are availible on www.github.com</p>
 <h2>Documentation</h2>
 <ul>
@@ -245,6 +245,6 @@ It features background tasks and interactive chats, and can serve as an interfac
 <p>@Gnadelwartz</p>
 <h2>That's it!</h2>
 <p>If you feel that there's something missing or if you found a bug, feel free to submit a pull request!</p>
-<h4>$$VERSION$$ v0.96-pre-9-gb23aadd</h4>
+<h4>$$VERSION$$ v0.96-pre-13-ga71d68e</h4>
 </body>
 </html>
diff --git a/README.md b/README.md
index 56a382a..4f481a4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Uses [JSON.sh](http://github.com/dominictarr/JSON.sh), but no more TMUX.
 Even bashbot is written in bash, it depends on commands typically availible in a Unix/Linux Environment.
 More concret on the common commands provided by recent versions of [coreutils](https://en.wikipedia.org/wiki/List_of_GNU_Core_Utilities_commands), [busybox](https://en.wikipedia.org/wiki/BusyBox#Commands) or [toybox](https://landley.net/toybox/help.html), see [Developer Notes](doc/7_develop.md#common-commands)
 
-*Note for MacOS and BSD Users:* As bashbot use behavior of recent bash and (gnu)sed versions, bashbot may not run without installing additional software, see [Install Bashbot](doc/0_install.md)
+*Note for MacOS and BSD Users:* As bashbot heavily uses modern bash and (gnu) grep/sed features, bashbot will not run without installing additional software, see [Install Bashbot](doc/0_install.md)
 
 
 Bashbot [Documentation](https://github.com/topkecleon/telegram-bot-bash) and [Downloads](https://github.com/topkecleon/telegram-bot-bash/releases) are availible on www.github.com
@@ -218,4 +218,4 @@ This may happen if to many wrong requests are sent to api.telegram.org, e.g. usi
 
 If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
 
-#### $$VERSION$$ v0.96-pre-9-gb23aadd
+#### $$VERSION$$ v0.96-pre-13-ga71d68e
diff --git a/README.txt b/README.txt
index 0b50d73..c3b5a90 100644
--- a/README.txt
+++ b/README.txt
@@ -23,8 +23,8 @@ More concret on the common commands provided by recent versions of
 [toybox](https://landley.net/toybox/help.html), see [Developer 
 Notes](doc/7_develop.md#common-commands)
 
-*Note for MacOS and BSD Users:* As bashbot use behavior of recent bash and 
-(gnu)sed versions, bashbot may not run without installing additional software, 
+*Note for MacOS and BSD Users:* As bashbot heavily uses modern bash and (gnu) 
+grep/sed features, bashbot will not run without installing additional software, 
 see [Install Bashbot](doc/0_install.md)
 
 
@@ -304,4 +304,4 @@ in 'mycommands.sh' as example.
 If you feel that there's something missing or if you found a bug, feel free to 
 submit a pull request!
 
-#### $$VERSION$$ v0.96-pre-9-gb23aadd
+#### $$VERSION$$ v0.96-pre-13-ga71d68e
diff --git a/bashbot.sh b/bashbot.sh
index f39bff7..cdca84e 100755
--- a/bashbot.sh
+++ b/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$$ v0.96-pre-12-gdba4f95
+#### $$VERSION$$ v0.96-pre-13-ga71d68e
 #
 # Exit Codes:
 # - 0 sucess (hopefully)
@@ -789,8 +789,8 @@ start_bot() {
 	local OFFSET=0
 	# adaptive sleep deafults
 	local nextsleep="100" :
-	local addsleep="100"
-	local maxsleep="$(( ${BASHBOT_SLEEP:-5000} + 100 ))"
+	local stepsleep="${BASHBOT_SLEEP_STEP:-100}"
+	local maxsleep="${BASHBOT_SLEEP:-5000}"
 	# redirect to Debug.log
 	[[ "${DEBUG}" == *"debug" ]] && exec &>>"${LOGDIR}/DEBUG.log"
 	[ -n "${DEBUG}" ] && date && echo "Start BASHBOT in Mode \"${DEBUG}\""
@@ -806,7 +806,7 @@ start_bot() {
 	# shellcheck source=./commands.sh
 	source "${COMMANDS}" "startbot"
 	# start timer events
-	if _is_function start_timer ; then
+	if [ -n "${BASHBOT_START_TIMER}" ] ; then
 		# shellcheck disable=SC2064
 		trap "event_timer $DEBUG" ALRM
 		start_timer &
@@ -814,11 +814,9 @@ start_bot() {
 		trap "kill -9 $!; exit" EXIT INT HUP TERM QUIT 
 	fi
 	while true; do
-set -x
 		# adaptive sleep in ms rounded to next 0.1 s
 		sleep "$(printf '%.1f' "$((nextsleep))e-3")"
-		((nextsleep+= addsleep , nextsleep= nextsleep>maxsleep ?maxsleep:nextsleep))
-set +x
+		((nextsleep+= stepsleep , nextsleep= nextsleep>maxsleep ?maxsleep:nextsleep))
 		# get next update
 		UPDATE="$(getJson "$UPD_URL$OFFSET" 2>/dev/null | "${JSONSHFILE}" -s -b -n | iconv -f utf-8 -t utf-8 -c)"
 		# did we ge an responsn0r
diff --git a/mycommands.sh b/mycommands.sh
index a75080d..1cf5dd4 100644
--- a/mycommands.sh
+++ b/mycommands.sh
@@ -8,7 +8,7 @@
 # #### if you start to develop your own bot, use the clean version of this file:
 # #### mycommands.clean
 #
-#### $$VERSION$$ v0.96-pre-9-gb23aadd
+#### $$VERSION$$ v0.96-pre-13-ga71d68e
 #
 
 # uncomment the following lines to overwrite info and help messages
@@ -31,8 +31,19 @@ export FILE_REGEX="${BASHBOT_ETC}/.*"
 
 # unset BASHBOT_RETRY to enable retry in case of recoverable errors, e.g.  throtteling
 # see logs/ERROR.log for information why send_messages etc. fail
-# unset BOTSEND_RETRY
 export BOTSEND_RETRY="no"
+#unset BOTSEND_RETRY
+
+# set value for adaptive sleeping while waitingnfor uodates in millisconds
+# max slepp between polling updates 10s (default 5s)
+export BASHBOT_SLEEP="10000"
+# add 0.2s if no update availble, up to BASHBOT_SLEEP (default 0.1s)
+export BASHBOT_SLEEP_STEP="200"
+
+# if you want to use timer functions, set BASHBOT_START_TImer to not empty value
+# default is to nit start timer
+unset BASHBOT_START_TIMER
+#export BASHBOT_START_TIMER="yes"
 
 # set to "yes" and give your bot admin privilegs to remove service messaes from groups
 export SILENCER="no"
diff --git a/mycommands.sh.clean b/mycommands.sh.clean
index 184fd92..1902803 100644
--- a/mycommands.sh.clean
+++ b/mycommands.sh.clean
@@ -4,7 +4,7 @@
 # files: mycommands.sh.clean
 # copy to mycommands.sh and add all your commands and functions here ...
 #
-#### $$VERSION$$ v0.96-pre-9-gb23aadd
+#### $$VERSION$$ v0.96-pre-13-ga71d68e
 #
 
 ##########
@@ -29,9 +29,19 @@ export FILE_REGEX="${BASHBOT_ETC}/.*"
 
 # unset BASHBOT_RETRY to enable retry in case of recoverable errors, e.g.  throtteling
 # see logs/ERROR.log for information why send_messages etc. fail
-# unset BOTSEND_RETRY
 export BOTSEND_RETRY="no"
+#unset BOTSEND_RETRY
 
+# set value for adaptive sleeping while waitingnfor uodates in millisconds
+# max slepp between polling updates 10s (default 5s)
+export BASHBOT_SLEEP="10000"
+# add 0.2s if no update availble, up to BASHBOT_SLEEP (default 0.1s)
+export BASHBOT_SLEEP_STEP="200"
+
+# if you want to use timer functions, set BASHBOT_START_TImer to not empty value
+# default is to nit start timer
+unset BASHBOT_START_TIMER
+#export BASHBOT_START_TIMER="yes"
 # set to "yes" and give your bot admin privilegs to remove service messaes from groups
 export SILENCER="no"