octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-11-25 16:57:33 +00:00
Code Issues Projects Releases Wiki Activity

revert jsshDB optimisation

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-01-02 00:32:32 +01:00
parent 05b81ff31d
commit 5d9df7b7fd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bashbot.sh
View File

@ -30,7 +30,7 @@
# 8 - curl/wget missing # 8 - curl/wget missing
# 10 - not bash! # 10 - not bash!
# #
#### $$VERSION$$ v1.21-pre-17-g652398e #### $$VERSION$$ v1.21-pre-18-g05b81ff
################################################################## ##################################################################
# emmbeded system may claim bash but it is not # emmbeded system may claim bash but it is not
@ -334,8 +334,10 @@ done
# do we have BSD sed # do we have BSD sed
sed '1ia' </dev/null 2>/dev/null || printf "${ORANGE}Warning: You may run on a BSD style system without gnu utils ...${NN}" sed '1ia' </dev/null 2>/dev/null || printf "${ORANGE}Warning: You may run on a BSD style system without gnu utils ...${NN}"
#jsonDB is now mandatory #jsonDB is now mandatory
_is_function jssh_newDB || printf "${RED}ERROR: Mandatory module jsonDB is missing or not readable!${NN}" && exit 6 if ! _is_function jssh_newDB; then
printf "${RED}ERROR: Mandatory module jsonDB is missing or not readable!${NN}"
exit 6
fi
# $1 URL, $2 filename in DATADIR # $1 URL, $2 filename in DATADIR
# outputs final filename # outputs final filename

4
test/c-init-test.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#### $$VERSION$$ v1.21-dev-26-gbe87ba3 #### $$VERSION$$ v1.21-pre-18-g05b81ff
# include common functions and definitions # include common functions and definitions
# shellcheck source=test/ALL-tests.inc.sh # shellcheck source=test/ALL-tests.inc.sh
@ -7,7 +7,7 @@ source "./ALL-tests.inc.sh"
TESTFILES="${TOKENFILE} ${ACLFILE} ${COUNTFILE} ${BLOCKEDFILE} ${ADMINFILE}" TESTFILES="${TOKENFILE} ${ACLFILE} ${COUNTFILE} ${BLOCKEDFILE} ${ADMINFILE}"
set -e #set -e
# run bashbot first time with init # run bashbot first time with init
"${TESTDIR}/bashbot.sh" init >"${LOGFILE}" <<EOF "${TESTDIR}/bashbot.sh" init >"${LOGFILE}" <<EOF