mirror of
https://github.com/octoleo/telegram-bot-bash.git
synced 2024-11-28 18:26:28 +00:00
Bashbot Version 1.5
This commit is contained in:
parent
8adca9beea
commit
369124bada
@ -145,6 +145,7 @@
|
|||||||
pre > code.sourceCode { white-space: pre; position: relative; }
|
pre > code.sourceCode { white-space: pre; position: relative; }
|
||||||
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
|
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
|
||||||
pre > code.sourceCode > span:empty { height: 1.2em; }
|
pre > code.sourceCode > span:empty { height: 1.2em; }
|
||||||
|
.sourceCode { overflow: visible; }
|
||||||
code.sourceCode > span { color: inherit; text-decoration: inherit; }
|
code.sourceCode > span { color: inherit; text-decoration: inherit; }
|
||||||
div.sourceCode { margin: 1em 0; }
|
div.sourceCode { margin: 1em 0; }
|
||||||
pre.sourceCode { margin: 0; }
|
pre.sourceCode { margin: 0; }
|
||||||
@ -392,6 +393,6 @@ It features background tasks and interactive chats, and can serve as an interfac
|
|||||||
<p>@Gnadelwartz</p>
|
<p>@Gnadelwartz</p>
|
||||||
<h2>That's it all guys!</h2>
|
<h2>That's it all guys!</h2>
|
||||||
<p>If you feel that there's something missing or if you found a bug, feel free to submit a pull request!</p>
|
<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$$ v1.45-dev-75-gfdb2b3a</h4>
|
<h4>$$VERSION$$ v1.5-0-g8adca9b</h4>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -242,4 +242,4 @@ See `mycommnds.sh.dist` for an example.
|
|||||||
|
|
||||||
If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
|
If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
@ -319,5 +319,5 @@ That's it all guys!
|
|||||||
If you feel that there's something missing or if you found a bug, feel free to submit a
|
If you feel that there's something missing or if you found a bug, feel free to submit a
|
||||||
pull request!
|
pull request!
|
||||||
|
|
||||||
$$VERSION$$ v1.45-dev-75-gfdb2b3a
|
$$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# this addon counts how many files, e.g. stickers, are sent to
|
# this addon counts how many files, e.g. stickers, are sent to
|
||||||
# a chat and takes actions if threshold is reached
|
# a chat and takes actions if threshold is reached
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# used events:
|
# used events:
|
||||||
#
|
#
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Addons can register to bashbot events at startup
|
# Addons can register to bashbot events at startup
|
||||||
# by providing their name and a callback per event
|
# by providing their name and a callback per event
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#
|
#
|
||||||
# If an event occurs each registered event function is called.
|
# If an event occurs each registered event function is called.
|
||||||
#
|
#
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# tested on: ubuntu, opensuse, debian
|
# tested on: ubuntu, opensuse, debian
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
# shellcheck disable=SC2009
|
# shellcheck disable=SC2009
|
||||||
# shellcheck disable=SC2181
|
# shellcheck disable=SC2181
|
||||||
# shellcheck disable=SC2250
|
# shellcheck disable=SC2250
|
||||||
@ -38,7 +38,7 @@ runas="nobody"
|
|||||||
# your bot name as given to botfather, e.g. mysomething_bot
|
# your bot name as given to botfather, e.g. mysomething_bot
|
||||||
name=""
|
name=""
|
||||||
# your bot installation dir
|
# your bot installation dir
|
||||||
bashbotdir="/usr/local/github/telegram-bot-bash-develop/DIST/telegram-bot-bash"
|
bashbotdir="/usr/local/telegram-bot-bash"
|
||||||
databotdir="${bashbotdir}/data-bot-bash"
|
databotdir="${bashbotdir}/data-bot-bash"
|
||||||
# programs to run
|
# programs to run
|
||||||
bashbot="cd ${bashbotdir}; ${bashbotdir}/bashbot.sh"
|
bashbot="cd ${bashbotdir}; ${bashbotdir}/bashbot.sh"
|
||||||
@ -57,6 +57,7 @@ case "$1" in
|
|||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
'starthook')
|
'starthook')
|
||||||
|
printf "Starting bashbot in webhook mode ... "
|
||||||
$runcmd "$webhook $mode </dev/null &>>${bashbotdir}/logs/WEBHOOK.log &" # >/dev/null 2>&1 </dev/null
|
$runcmd "$webhook $mode </dev/null &>>${bashbotdir}/logs/WEBHOOK.log &" # >/dev/null 2>&1 </dev/null
|
||||||
sleep 1
|
sleep 1
|
||||||
$0 status
|
$0 status
|
||||||
@ -67,9 +68,11 @@ case "$1" in
|
|||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
'stophook')
|
'stophook')
|
||||||
|
printf "Stopping bashbot webhook mode ... "
|
||||||
KILLID="$(ps -f -u "${runas}" | grep "process_batch.sh --startbot" | sed -E 's/[^0-9]+([0-9]+).*/\1/')"
|
KILLID="$(ps -f -u "${runas}" | grep "process_batch.sh --startbot" | sed -E 's/[^0-9]+([0-9]+).*/\1/')"
|
||||||
if [ -n "${KILLID}" ]; then
|
if [ -n "${KILLID}" ]; then
|
||||||
$runcmd "kill $(printf "%s" "${KILLID}" | tr -s "\r\n" " " )"
|
$runcmd "kill $(printf "%s" "${KILLID}" | tr -s "\r\n" " " )"
|
||||||
|
sleep 1
|
||||||
$0 status
|
$0 status
|
||||||
fi
|
fi
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
|
@ -30,7 +30,7 @@ BOTCOMMANDS="-h help init start stop status suspendback resumeback killb
|
|||||||
# 8 - curl/wget missing
|
# 8 - curl/wget missing
|
||||||
# 10 - not bash!
|
# 10 - not bash!
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
# are we running in a terminal?
|
# are we running in a terminal?
|
||||||
|
@ -21,7 +21,7 @@ USAGE='any_command.sh [-h|--help] [--force|--reference] bot_command args ...'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 30.01.2021 10:24
|
# CREATED: 30.01.2021 10:24
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 18.12.2020 12:27
|
# CREATED: 18.12.2020 12:27
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
############
|
############
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 27.01.2021 13:42
|
# CREATED: 27.01.2021 13:42
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# shellcheck disable=SC2059
|
# shellcheck disable=SC2059
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ USAGE='bashbot_stats.sh [-h|--help] [debug]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 23.12.2020 20:34
|
# CREATED: 23.12.2020 20:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# set bashbot environment
|
# set bashbot environment
|
||||||
|
@ -20,7 +20,7 @@ USAGE='delete_message.sh [-h|--help] "CHAT[ID]" "MESSAGE[ID]" [debug]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 03.01.2021 15:37
|
# CREATED: 03.01.2021 15:37
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -26,7 +26,7 @@ USAGE='send_message.sh [-h|--help] "CHAT[ID]" "MESSAGE[ID]" "text|url" ...'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 21.01.2021 08:10
|
# CREATED: 21.01.2021 08:10
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -23,7 +23,7 @@ USAGE='send_edit_message.sh [-h|--help] [format|caption] "CHAT[ID]" "MESSAGE[ID]
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 23.12.2020 16:52
|
# CREATED: 23.12.2020 16:52
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -20,7 +20,7 @@ USAGE='kickban_user.sh [-h|--help] [-u|--unban] "CHAT[ID]" "USER[ID]" [debug]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 25.01.2021 20:34
|
# CREATED: 25.01.2021 20:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -21,7 +21,7 @@ USAGE='process_update.sh [-h|--help] [-s|--startbot] [-w|--watch] [-n|--lines n]
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 27.02.2021 13:14
|
# CREATED: 27.02.2021 13:14
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-84-gae525c4
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
@ -74,7 +74,7 @@ fi
|
|||||||
# ready, do stuff here -----
|
# ready, do stuff here -----
|
||||||
|
|
||||||
# kill all sub processes on exit
|
# kill all sub processes on exit
|
||||||
trap 'kill $(jobs -p) 2>/dev/null; send_normal_message "'"${BOTADMIN}"'" "Bot '"${BOTNAME}"' webhook stopped ..."; printf "%(%c)T: %s\n" -1 "Bot in batch mode killed!"' EXIT HUP QUIT
|
trap 'kill $(jobs -p) 2>/dev/null; send_normal_message "'"${BOTADMIN}"'" "Bot '"${BOTNAME}"' webhook stopped ..."; printf "%(%c)T: %s\n" -1 "Bot in batch mode stopped!"' EXIT HUP QUIT
|
||||||
|
|
||||||
# wait after (first) update to avoid processing to many in parallel
|
# wait after (first) update to avoid processing to many in parallel
|
||||||
UPDWAIT="0.5"
|
UPDWAIT="0.5"
|
||||||
|
@ -15,7 +15,7 @@ USAGE='process_update.sh [-h|--help] [debug] [<file]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 30.01.2021 19:14
|
# CREATED: 30.01.2021 19:14
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -25,7 +25,7 @@ USAGE='promote_user.sh [-h|--help] "CHAT[ID]" "USER[ID]" "right[:true|false]" ..
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 25.01.2021 22:34
|
# CREATED: 25.01.2021 22:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -28,7 +28,7 @@ USAGE='broadcast_message.sh [-h|--help] [--doit] [--groups|--both|--db=file] [fo
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 16.12.2020 16:14
|
# CREATED: 16.12.2020 16:14
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -26,7 +26,7 @@ USAGE='send_message.sh [-h|--help] "CHAT[ID]" "message" "text|url" ...'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 18.01.2021 11:34
|
# CREATED: 18.01.2021 11:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -21,7 +21,7 @@ USAGE='send_dice.sh [-h|--help] "CHAT[ID]" "emoji" [debug]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 07.02.2021 18:45
|
# CREATED: 07.02.2021 18:45
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -25,7 +25,7 @@ USAGE='send_file.sh [-h|--help] "CHAT[ID]" "file|URL" "caption ...." [type] [deb
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 25.12.2020 20:24
|
# CREATED: 25.12.2020 20:24
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -22,7 +22,7 @@ USAGE='send_message.sh [-h|--help] [format] "CHAT[ID]" "message ...." [debug]'
|
|||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 16.12.2020 11:34
|
# CREATED: 16.12.2020 11:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
@ -15,7 +15,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#
|
#
|
||||||
|
|
||||||
# bashbot locale defaults to c.UTF-8, adjust locale in mycommands.sh if needed
|
# bashbot locale defaults to c.UTF-8, adjust locale in mycommands.sh if needed
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# Description: run all tests, exit after failed test
|
# Description: run all tests, exit after failed test
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
#shellcheck disable=SC1090
|
#shellcheck disable=SC1090
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# Description: common stuff for all dev scripts
|
# Description: common stuff for all dev scripts
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
# magic to ensure that we're always inside the root of our application,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
# works together with git pre-push.sh and ADD all changed files since last push
|
# works together with git pre-push.sh and ADD all changed files since last push
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
#shellcheck disable=SC1090
|
#shellcheck disable=SC1090
|
||||||
source "${0%/*}/dev.inc.sh"
|
source "${0%/*}/dev.inc.sh"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
############
|
############
|
||||||
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
############
|
############
|
||||||
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
@ -51,7 +51,7 @@ printf "Update Version of modified files\n"
|
|||||||
if ! command -v bc &> /dev/null || (( $(printf "%s\n" "${VERSION} >= ${REMOTEVER}" | bc -l) )); then
|
if ! command -v bc &> /dev/null || (( $(printf "%s\n" "${VERSION} >= ${REMOTEVER}" | bc -l) )); then
|
||||||
# update version in bashbot files on push
|
# update version in bashbot files on push
|
||||||
set +f
|
set +f
|
||||||
[ -f "${LASTPUSH}" ] && LASTFILES="$(find ./* -newer "${LASTPUSH}")"
|
[ -f "${LASTPUSH}" ] && LASTFILES="$(find ./* -newer "${LASTPUSH}" ! -path "./DIST/*" ! -path "./STANDALONE/*")"
|
||||||
[ "${LASTFILES}" = "" ] && exit
|
[ "${LASTFILES}" = "" ] && exit
|
||||||
printf " "
|
printf " "
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
@ -65,7 +65,7 @@ fi
|
|||||||
|
|
||||||
if command -v codespell &>/dev/null; then
|
if command -v codespell &>/dev/null; then
|
||||||
printf "Running codespell\n............................\n"
|
printf "Running codespell\n............................\n"
|
||||||
codespell -q 3 --skip="*.zip,*gz,*.log,*.html,*.txt,.git*,jsonDB-keyboard" -L "ba"
|
codespell -q 3 --skip="*.zip,*gz,*.log,*.html,*.txt,.git*,jsonDB-keyboard,DIST,STANDALONE" -L "ba"
|
||||||
printf "if there are (to many) typo's shown, consider running:\ncodespell -i 3 -w --skip=\"*.log,*.html,*.txt,.git*,examples\" -L \"ba\"\n"
|
printf "if there are (to many) typo's shown, consider running:\ncodespell -i 3 -w --skip=\"*.log,*.html,*.txt,.git*,examples\" -L \"ba\"\n"
|
||||||
else
|
else
|
||||||
printf "consider installing codespell: pip install codespell\n"
|
printf "consider installing codespell: pip install codespell\n"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
############
|
############
|
||||||
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
# Usage: source inject-json.sh
|
# Usage: source inject-json.sh
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
# download JSON.sh
|
# download JSON.sh
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# this has to run once atfer git clone
|
# this has to run once atfer git clone
|
||||||
# and every time we create new hooks
|
# and every time we create new hooks
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
#shellcheck disable=SC1090
|
#shellcheck disable=SC1090
|
||||||
source "${0%/*}/dev.inc.sh"
|
source "${0%/*}/dev.inc.sh"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
# Options: --notest - skip tests
|
# Options: --notest - skip tests
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
#shellcheck disable=SC1090
|
#shellcheck disable=SC1090
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
# Usage: source make-hmtl
|
# Usage: source make-hmtl
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
# check for correct dir
|
# check for correct dir
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# If you your bot is finished you can use make-standalone.sh to create the
|
# If you your bot is finished you can use make-standalone.sh to create the
|
||||||
# the old all-in-one bashbot: bashbot.sh and commands.sh only!
|
# the old all-in-one bashbot: bashbot.sh and commands.sh only!
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
###################################################################
|
###################################################################
|
||||||
|
|
||||||
# include git config and change to base dir
|
# include git config and change to base dir
|
||||||
@ -55,6 +55,9 @@ cp -p ${DISTBINFILES} "${DISTDIR}/bin" 2>/dev/null
|
|||||||
|
|
||||||
cd "${DISTDIR}" || exit 1
|
cd "${DISTDIR}" || exit 1
|
||||||
|
|
||||||
|
# remove log files
|
||||||
|
find . -name '*.log' -delete
|
||||||
|
|
||||||
# shellcheck disable=SC2250
|
# shellcheck disable=SC2250
|
||||||
for dir in $DISTMKDIR
|
for dir in $DISTMKDIR
|
||||||
do
|
do
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# joke hack to obfuscate bashbot.min.sh
|
# joke hack to obfuscate bashbot.min.sh
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
# shellcheck disable=SC2028,SC2016,SC1117
|
# shellcheck disable=SC2028,SC2016,SC1117
|
||||||
|
|
||||||
infile="bashbot.sh"
|
infile="bashbot.sh"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# list of additional files to check from shellcheck
|
# list of additional files to check from shellcheck
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
bashbot.rc
|
bashbot.rc
|
||||||
mycommands.conf
|
mycommands.conf
|
||||||
mycommands.sh.clean
|
mycommands.sh.clean
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-78-gc4e2981
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
#
|
#
|
||||||
# Easy Versioning in git:
|
# Easy Versioning in git:
|
||||||
@ -50,7 +50,7 @@ else
|
|||||||
printf "Update version string in all files? (y/N)\b\b"
|
printf "Update version string in all files? (y/N)\b\b"
|
||||||
read -r answer
|
read -r answer
|
||||||
[[ "${answer}" != "y" && "${answer}" != "Y" ]] && exit
|
[[ "${answer}" != "y" && "${answer}" != "Y" ]] && exit
|
||||||
FILES="$(find ./* -type f)"
|
FILES="$(find ./* -type f ! -path "./DIST/*" ! -path "./STANDALONE/*")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# autogenerate REMADME.html REMADE.txt
|
# autogenerate REMADME.html REMADE.txt
|
||||||
|
@ -132,5 +132,5 @@ You must update to [Version 1.20](https://github.com/topkecleon/telegram-bot-bas
|
|||||||
|
|
||||||
#### [Next Create Bot](1_firstbot.md)
|
#### [Next Create Bot](1_firstbot.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -65,5 +65,5 @@ group. This step is up to you actually.
|
|||||||
#### [Prev Installation](0_install.md)
|
#### [Prev Installation](0_install.md)
|
||||||
#### [Next Getting started](2_usage.md)
|
#### [Next Getting started](2_usage.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -30,7 +30,9 @@ Have FUN!
|
|||||||
│
|
│
|
||||||
├── bashbot.sh # main bashbot script - DO NOT EDIT!
|
├── bashbot.sh # main bashbot script - DO NOT EDIT!
|
||||||
├── commands.sh # command dispatcher - DO NOT EDIT!
|
├── commands.sh # command dispatcher - DO NOT EDIT!
|
||||||
├── JSON.sh # bashbots JSON parser, see https://github.com/dominictarr/JSON.sh
|
├── JSON.sh # bashbot JSON parsers
|
||||||
|
│ ├── JSON.sh # sh implementation, https://github.com/dominictarr/JSON.sh
|
||||||
|
│ └── JSON.awk.dist # faster awk version, https://github.com/step-/JSON.awk
|
||||||
│
|
│
|
||||||
├── bin # ready to use scripts, use `scriptname --help` for help
|
├── bin # ready to use scripts, use `scriptname --help` for help
|
||||||
│ ├── bashbot_stats.sh # does what it says ...
|
│ ├── bashbot_stats.sh # does what it says ...
|
||||||
@ -44,7 +46,7 @@ Have FUN!
|
|||||||
│ ├── kickban_user.sh # kick/unban user from given chat
|
│ ├── kickban_user.sh # kick/unban user from given chat
|
||||||
│ ├── promote_user.sh # promote/dente user rights in given chat
|
│ ├── promote_user.sh # promote/dente user rights in given chat
|
||||||
│ │
|
│ │
|
||||||
│ └── bashbot_env.inc.sh # sourced from scripts, adapt locations if needed
|
│ ├── bashbot_env.inc.sh # sourced from scripts, adapt locations if needed
|
||||||
│ └── bashbot_init.inc.sh # sourced from bashbot.sh init
|
│ └── bashbot_init.inc.sh # sourced from bashbot.sh init
|
||||||
│
|
│
|
||||||
├── scripts # place your bashbot interactive and background scripts here
|
├── scripts # place your bashbot interactive and background scripts here
|
||||||
@ -55,15 +57,15 @@ Have FUN!
|
|||||||
├── modules # optional functions, sourced by commands.sh
|
├── modules # optional functions, sourced by commands.sh
|
||||||
│ ├── aliases.sh # to disable modules rename them xxx.sh.off
|
│ ├── aliases.sh # to disable modules rename them xxx.sh.off
|
||||||
│ ├── answerInline.sh
|
│ ├── answerInline.sh
|
||||||
│ ├── jsshDB.sh # read and store JSON.sh style JSON, mandatory
|
|
||||||
│ ├── background.sh # interactive and background functions
|
│ ├── background.sh # interactive and background functions
|
||||||
│ ├── chatMember.sh
|
│ ├── chatMember.sh # manage chat mambers
|
||||||
│ └── sendMessage.sh # main send message functions, mandatory
|
│ ├── jsshDB.sh # read and store JSON.sh style JSON, mandatory
|
||||||
|
│ ├── processUpdates.sh # process updates from telegram, mandatory (run bot)
|
||||||
|
│ └── sendMessage.sh # send message functions, mandatory
|
||||||
│
|
│
|
||||||
├── addons # optional addons, disabled by default
|
├── addons # optional addons, disabled by default
|
||||||
│ ├── example.sh # to enable addons change their XXX_ENABLE to true
|
│ ├── example.sh # to enable addons change their XXX_ENABLE to true
|
||||||
│ ├── antiFlood.sh # simple addon taking actions based on # files and text sent to chat
|
│ └── antiFlood.sh # simple addon taking actions based on # files and text sent to chat
|
||||||
│ └── xxxxxage.sh
|
|
||||||
│
|
│
|
||||||
├── bashbot.rc # start/stop script if you run bashbot as service
|
├── bashbot.rc # start/stop script if you run bashbot as service
|
||||||
│
|
│
|
||||||
@ -390,5 +392,5 @@ send_action "${CHAT[ID]}" "action"
|
|||||||
#### [Prev Create Bot](1_firstbot.md)
|
#### [Prev Create Bot](1_firstbot.md)
|
||||||
#### [Next Advanced Usage](3_advanced.md)
|
#### [Next Advanced Usage](3_advanced.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -302,5 +302,5 @@ Note: If you disable automatic retry, se above, you disable also connection prob
|
|||||||
#### [Prev Getting started](2_usage.md)
|
#### [Prev Getting started](2_usage.md)
|
||||||
#### [Next Expert Use](4_expert.md)
|
#### [Next Expert Use](4_expert.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -434,5 +434,5 @@ for every poll until the maximum of BASHBOT_SLEEP ms.
|
|||||||
#### [Prev Advanced Use](3_advanced.md)
|
#### [Prev Advanced Use](3_advanced.md)
|
||||||
#### [Next Best Practice](5_practice.md)
|
#### [Next Best Practice](5_practice.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -160,5 +160,5 @@ The second warning is about an unused variable, this is true because in our exam
|
|||||||
#### [Prev Best Practice](5_practice.md)
|
#### [Prev Best Practice](5_practice.md)
|
||||||
#### [Next Functions Reference](6_reference.md)
|
#### [Next Functions Reference](6_reference.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -1673,5 +1673,5 @@ The name of your bot is available as bash variable "$ME", there is no need to ca
|
|||||||
#### [Prev Best Practice](5_practice.md)
|
#### [Prev Best Practice](5_practice.md)
|
||||||
#### [Next Notes for Developers](7_develop.md)
|
#### [Next Notes for Developers](7_develop.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -387,5 +387,5 @@ fi
|
|||||||
|
|
||||||
#### [Prev Function Reference](6_reference.md)
|
#### [Prev Function Reference](6_reference.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -60,6 +60,6 @@ plus use of keyboards in private chats. It's an extended version of mycommands.s
|
|||||||
|
|
||||||
**Webhook** contains instructions on how use webhook API to get updates from telegram instead polling Telegram server.
|
**Webhook** contains instructions on how use webhook API to get updates from telegram instead polling Telegram server.
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# file: run_filename
|
# file: run_filename
|
||||||
# background job to display content of all new files in WATCHDIR
|
# background job to display content of all new files in WATCHDIR
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# file: run_filename
|
# file: run_filename
|
||||||
# background job to display all new files in WATCHDIR
|
# background job to display all new files in WATCHDIR
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
@ -4,7 +4,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
@ -6,7 +6,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)
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# adjust your language setting here
|
# adjust your language setting here
|
||||||
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# file. multibot.sh
|
# file. multibot.sh
|
||||||
# description: run multiple telegram bots from one installation
|
# description: run multiple telegram bots from one installation
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
if [ "$2" = "" ] || [ "$2" = "-h" ]; then
|
if [ "$2" = "" ] || [ "$2" = "-h" ]; then
|
||||||
echo "Usage: $0 botname command"
|
echo "Usage: $0 botname command"
|
||||||
|
@ -7,7 +7,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
|
||||||
SHELL=/bin/sh
|
SHELL=/bin/sh
|
||||||
|
@ -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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# AUTHOR: KayM (), kay@rrr.de
|
# AUTHOR: KayM (), kay@rrr.de
|
||||||
# DATE: 19.12.2020 19:03
|
# DATE: 19.12.2020 19:03
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
|
@ -13,7 +13,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
@ -10,7 +10,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# file: botacl
|
# file: botacl
|
||||||
# a user not listed here, will return false from 'user_is_allowed'
|
# a user not listed here, will return false from 'user_is_allowed'
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
# Format:
|
# Format:
|
||||||
# user:resource:chat
|
# user:resource:chat
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# to show how you can customize bashbot by only editing mycommands.sh
|
# to show how you can customize bashbot by only editing mycommands.sh
|
||||||
# NOTE: this is not tested, simply copied from original source and reworked!
|
# NOTE: this is not tested, simply copied from original source and reworked!
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
|
@ -98,5 +98,5 @@ webhook updates only over secure TLS connections with a valid SSL certificate ch
|
|||||||
`socat` looks like a tool to listen for Telegram updates from bash scripts, let's see ...
|
`socat` looks like a tool to listen for Telegram updates from bash scripts, let's see ...
|
||||||
|
|
||||||
|
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
* @license http://www.wtfpl.net/txt/copying/ WTFPLv2
|
* @license http://www.wtfpl.net/txt/copying/ WTFPLv2
|
||||||
* @since 30.01.2021 20:24
|
* @since 30.01.2021 20:24
|
||||||
*
|
*
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
***********************************************************/
|
***********************************************************/
|
||||||
|
|
||||||
// bashbot home dir
|
// bashbot home dir
|
||||||
|
@ -5,7 +5,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#
|
#
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
@ -5,7 +5,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC1117,SC2059
|
# shellcheck disable=SC1117,SC2059
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
@ -5,7 +5,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
@ -5,7 +5,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#
|
#
|
||||||
# source from commands.sh to use jsonDB functions
|
# source from commands.sh to use jsonDB functions
|
||||||
#
|
#
|
||||||
@ -358,7 +358,7 @@ Json2Array() {
|
|||||||
# match ["....."]\t and replace \t with = and print delete ` quote true false escape not escaped $
|
# match ["....."]\t and replace \t with = and print delete ` quote true false escape not escaped $
|
||||||
# shellcheck disable=SC1091,SC1090
|
# shellcheck disable=SC1091,SC1090
|
||||||
[ -z "$1" ] || source <( printf "$1"'=( %s )'\
|
[ -z "$1" ] || source <( printf "$1"'=( %s )'\
|
||||||
"$(sed -E -n -e '/\["[-0-9a-zA-Z_,."]+"\]\+*\t/ s/\t/=/p' -e 's/`//g' -e 's/=(true|false)/="\1"/' -e 's/([^\]|^)\$/\1\\$/g')" )
|
"$(sed -E -n -e '/\["[-0-9a-zA-Z_,."]+"\]\+*\t/ s/\t/=/p' -e 's/[`´]//g' -e 's/=(true|false)/="\1"/' -e 's/([^\]|^)\$/\1\\$/g')" )
|
||||||
}
|
}
|
||||||
# get Config Key from jssh file without jsshDB
|
# get Config Key from jssh file without jsshDB
|
||||||
# output ARRAY as JSON.sh style data
|
# output ARRAY as JSON.sh style data
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# File: processUpdates.sh
|
# File: processUpdates.sh
|
||||||
# Note: DO NOT EDIT! this file will be overwritten on update
|
# Note: DO NOT EDIT! this file will be overwritten on update
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-85-g41e6883
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
##############
|
##############
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# Author: KayM (gnadelwartz), kay@rrr.de
|
# Author: KayM (gnadelwartz), kay@rrr.de
|
||||||
# Created: 09.01.2021 07:27
|
# Created: 09.01.2021 07:27
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#######################################################
|
#######################################################
|
||||||
|
|
||||||
##########
|
##########
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# License: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# License: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# Author: KayM (gnadelwartz), kay@rrr.de
|
# Author: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#######################################################
|
#######################################################
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# License: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# License: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# Author: KayM (gnadelwartz), kay@rrr.de
|
# Author: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#######################################################
|
#######################################################
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
|
|
||||||
|
@ -12,7 +12,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$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# magic to ensure that we're always inside the root of our application,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# common variables
|
# common variables
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
../dev/hooks/pre-commit.sh
|
../dev/hooks/pre-commit.sh
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
# shellcheck source=test/ALL-tests.inc.sh
|
# shellcheck source=test/ALL-tests.inc.sh
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.45-dev-75-gfdb2b3a
|
#### $$VERSION$$ v1.5-0-g8adca9b
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
Loading…
Reference in New Issue
Block a user