diff --git a/commands.sh b/commands.sh index 9151065..d6aab2b 100644 --- a/commands.sh +++ b/commands.sh @@ -15,7 +15,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.94-pre-4-gd28f975 +#### $$VERSION$$ v0.94-pre-7-g64efe96 # # adjust your language setting here, e.g.when run from other user or cron. @@ -66,7 +66,7 @@ fi # copy "mycommands.sh.dist" to "mycommnds.sh" and change the values there # defaults to no inline and nonsense home dir export INLINE="0" -export FILE_REGEX='/home/user/allowed/.*' +export FILE_REGEX="${BASHBOT_ETC}/.*" # load mycommands diff --git a/dev/shellcheck.files b/dev/shellcheck.files index dda315e..c3728dd 100644 --- a/dev/shellcheck.files +++ b/dev/shellcheck.files @@ -1,3 +1,4 @@ # list of additional files to check from shellcheck -#### $$VERSION$$ v0.94-dev3-0-geef955a +#### $$VERSION$$ v0.94-pre-7-g64efe96 bashbot.rc +mycommands.sh.clean diff --git a/doc/6_reference.md b/doc/6_reference.md index c6dcfc2..34a57bc 100644 --- a/doc/6_reference.md +++ b/doc/6_reference.md @@ -935,5 +935,5 @@ The name of your bot is availible as bash variable "$ME", there is no need to ca #### [Prev Best Practice](5_practice.md) #### [Next Notes for Developers](7_develop.md) -#### $$VERSION$$ v0.94-pre-6-g1e0de91 +#### $$VERSION$$ v0.94-pre-7-g64efe96 diff --git a/modules/jsonDB.sh b/modules/jsonDB.sh index 8bbba30..76302c2 100644 --- a/modules/jsonDB.sh +++ b/modules/jsonDB.sh @@ -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.94-pre-6-g1e0de91 +#### $$VERSION$$ v0.94-pre-7-g64efe96 # # source from commands.sh to use jsonDB functions # diff --git a/mycommands.sh b/mycommands.sh index 04bdb2e..54021cb 100644 --- a/mycommands.sh +++ b/mycommands.sh @@ -8,15 +8,15 @@ # #### if you start to develop your own bot, use the clean version of this file: # #### mycommands.clean # -#### $$VERSION$$ v0.94-pre-4-gd28f975 +#### $$VERSION$$ v0.94-pre-7-g64efe96 # # uncomment the following lines to overwrite info and help messages -# bashbot_info='This is bashbot, the Telegram bot written entirely in bash. +# export bashbot_info='This is bashbot, the Telegram bot written entirely in bash. #' -# bashbot_help='*Available commands*: +# export bashbot_help='*Available commands*: #' -res="" +export res="" # Set INLINE to 1 in order to receive inline queries. # To enable this option in your bot, send the /setinline command to @BotFather. @@ -25,7 +25,7 @@ export INLINE="0" # NOTE: this is a regex, not shell globbing! you must use a valid egex, # '.' matches any charater and '.*' matches all remaining charatcers! # additionally you must escape special charaters with '\', e.g. '\. \? \[ \*" to match them literally -export FILE_REGEX='^/home/user/allowed/.*' +export FILE_REGEX="${BASHBOT_ETC}/.*" # example: run bashbot over TOR # export BASHBOT_CURL_ARGS="--socks5-hostname 127.0.0.1:9050" diff --git a/mycommands.sh.clean b/mycommands.sh.clean index e525ef2..e231a48 100644 --- a/mycommands.sh.clean +++ b/mycommands.sh.clean @@ -4,18 +4,18 @@ # files: mycommands.sh.clean # copy to mycommands.sh and add all your commands and functions here ... # -#### $$VERSION$$ v0.94-pre-4-gd28f975 +#### $$VERSION$$ v0.94-pre-7-g64efe96 # ########## # edit the following lines to fit your bot usage -bashbot_info='This is bashbot, the Telegram bot written entirely in bash. +export bashbot_info='This is bashbot, the Telegram bot written entirely in bash. ' -bashbot_help='*Available commands*: +export bashbot_help='*Available commands*: ' -res="" +export res="" # Set INLINE to 1 in order to receive inline queries. # To enable this option in your bot ypu must also send the /setinline command to @BotFather. @@ -25,7 +25,7 @@ export INLINE="0" # '.' matches any charater and '.*' matches all remaining charatcers! # additionally you must escape special charaters with '\', e.g. '\. \? \[ \*" to match them literally # do NOT set to .* as this allow sending files from all locations! -export FILE_REGEX='^/home/user/allowed/.*' +export FILE_REGEX="${BASHBOT_ETC}/.*" # set to "yes" and give your bot admin privilegs to remove service messaes from groups export SILENCER="no"