octoleo
/
telegram-bot-bash
mirror of https://github.com/octoleo/telegram-bot-bash.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

fix stupid mynewlinestartshere mistake

This commit is contained in:
Kay Marquardt (Gnadelwartz) 2019-04-27 15:48:03 +02:00
parent 3719c81f9d
commit 0d38a67cf5
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -75,8 +75,17 @@ To set access rights for your bashbot installation to a reasonable default run `
### Is this Bot insecure?
Bashbot is not more (in)secure as any other Bot written in any other language, we have done our best to make it as secure as possible. But YOU are responsible for the bot commands you wrote and you should know about the risks ...
### Why Bash and not the much better ...?
Well, thats a damn good question ... may be because I'm an Unix/Linux admin from stone age. Nevertheless there are more reasons from my side:
- bashbot will run everywhere where bash is availible, from ebedded linux to mainframe
- easy to integrate with other shell/bashscripts for system admins to send status updates
- no need to install or learn a new programming language, library or framwework
- no database, not event driven, not OO ...
-
## That's it!
If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
#### $$VERSION$$ v0.70-pre1-2-g293ad08
#### $$VERSION$$ v0.70-pre1-3-g3719c81

17
README.txt
View File

@ -121,11 +121,26 @@ language, we have done our best to make it as secure as possible. But
YOU are responsible for the bot commands you wrote and you should know
about the risks ...
Why Bash and not the much better ...?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Well, thats a damn good question ... may be because I'm an Unix/Linux
admin from stone age. Nevertheless there are more reasons from my side:
* bashbot will run everywhere where bash is availible, from ebedded
linux to mainframe
* easy to integrate with other shell/bashscripts for system admins to
send status updates
* no need to install or learn a new programming language, library or
framwework
* no database, not event driven, not OO ...
*
That's it!
~~~~~~~~~~
If you feel that there's something missing or if you found a bug, feel
free to submit a pull request!
latexmath:[\[VERSION\]] v0.70-pre1-2-g293ad08
latexmath:[\[VERSION\]] v0.70-pre1-3-g3719c81
+++++++++++++++++++++++++++++++++++++++++++++

8
bashbot.rc
View File

@ -1,7 +1,7 @@
#!/bin/sh
# description: Start or stop telegram-bash-bot
#
#### $$VERSION$$ v0.70-pre1-0-g490c472
#### $$VERSION$$ v0.70-pre1-3-g3719c81
# shellcheck disable=SC2009
# shellcheck disable=SC2181
@ -69,12 +69,16 @@ case "$1" in
$0 stop; $0 start
RETVAL=$?
;;
'restartback')
$0 suspendback; $0 resumeback
RETVAL=$?
;;
'suspendback'|'resumeback'|'killback')
$runcmd "$start $1"
RETVAL=$?
;;
*)
echo "Usage: $0 { start | stop | restart | reload | suspendback | resumeback | killback }"
echo "Usage: $0 { start | stop | restart | reload | restartback | suspendback | resumeback | killback }"
RETVAL=1
;;
esac

4
modules/background.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.70-pre1-0-g490c472
#### $$VERSION$$ v0.70-pre1-3-g3719c81
# source from commands.sh if you want ro use interactive or background jobs
@ -18,7 +18,7 @@ send_message() {
local text arg keyboard btext burl no_keyboard file lat long title address sent
[ "$2" = "" ] && return
local mychat="$1"
text="$(sed <<< "${2}" 's/ mynewlinestartshere /\r\n/g; s/ my[kfltab][a-z]\{2,13\}startshere.*//g;s/ mykeyboardendshere.*//g')"
text="$(sed <<< "${2}" 's/ mynewlinestartshere/\r\n/g; s/ my[kfltab][a-z]\{2,13\}startshere.*//g;s/ mykeyboardendshere.*//g')"
arg="$3"
[ "$arg" != "safe" ] && {
no_keyboard="$(sed <<< "${2}" '/mykeyboardendshere/!d;s/.*mykeyboardendshere.*/mykeyboardendshere/')"