Skip to content

Commit

Permalink
Merge pull request #160 prepare for version 1.2
Browse files Browse the repository at this point in the history
prepare version 1.2
  • Loading branch information
gnadelwartz authored Nov 29, 2020
2 parents 8df7a3b + b4c83c1 commit 6dc8f1b
Show file tree
Hide file tree
Showing 20 changed files with 287 additions and 237 deletions.
209 changes: 105 additions & 104 deletions README.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ wait

@Gnadelwartz

## That's it!
## That's it all guys!

If you feel that there's something missing or if you found a bug, feel free to
submit a pull request!

#### $$VERSION$$ v1.1-0-gc0eb399
#### $$VERSION$$ v1.1-0-ge835bbc
4 changes: 2 additions & 2 deletions addons/example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Addons can register to bashbot events at startup
# by providing their name and a callback per event
#
#### $$VERSION$$ v1.0-0-g99217c4
#### $$VERSION$$ v1.2-dev-13-g2a5d47d
#
# If an event occurs each registered event function is called.
#
Expand All @@ -29,7 +29,7 @@
# BASHBOT_EVENT_LOCATION location or venue received
# BASHBOT_EVENT_FILE file received
#
# BAHSBOT_EVENT_TIMER this event is a bit special as it fires every Minute
# BASHBOT_EVENT_TIMER this event is a bit special as it fires every Minute
# and has 3 meanings: oneshot, every time, every X minutes.
#
# all global variables and functions can be used in registered functions.
Expand Down
6 changes: 2 additions & 4 deletions bashbot.rc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# description: Start or stop telegram-bash-bot
#
#### $$VERSION$$ v1.1-0-gc0eb399
#### $$VERSION$$ v1.2-dev-13-g2a5d47d
# shellcheck disable=SC2009
# shellcheck disable=SC2181

Expand All @@ -17,14 +17,13 @@

# save default values
TERM="" # disable bashbot clear and color output
runas="nobody"
runcmd="echo Dry run:" # not activated until you edit lines below

#######################
# Configuration Section

# edit the next line to fit the user you want to run bashbot, e.g. nobody:
# runas="nobody"
runas="nobody"

# uncomment one of the following lines to fit your system
# runcmd="su $runas -s /bin/bash -c " # runasuser with *su*
Expand Down Expand Up @@ -81,4 +80,3 @@ case "$1" in
;;
esac
exit $RETVAL

Loading

0 comments on commit 6dc8f1b

Please sign in to comment.