Make state_get quiet for conditional tests
This commit is contained in:
parent
1b86e46aea
commit
549b863493
16
rowbot
16
rowbot
|
@ -223,7 +223,7 @@ seconds() {
|
|||
}
|
||||
|
||||
url() {
|
||||
if NS=net state_get tls; then
|
||||
if NS=net QUIET="" state_get tls; then
|
||||
printf ircs://
|
||||
else
|
||||
printf irc://
|
||||
|
@ -358,13 +358,17 @@ state_get() {
|
|||
declare -n ns_config=__rowbot_state_store_"$ns"
|
||||
|
||||
if [[ -v ns_config["$1"] ]]; then
|
||||
printf %s "${ns_config["$1"]}"
|
||||
if [[ ! -v QUIET || $QUIET = no ]]; then
|
||||
printf %s "${ns_config["$1"]}"
|
||||
fi
|
||||
|
||||
if [[ ${ns_config["$1"]} = no ]]; then
|
||||
return 1
|
||||
fi
|
||||
elif [[ -v DEFAULT ]]; then
|
||||
printf %s "$DEFAULT"
|
||||
if [[ ! -v QUIET || $QUIET = no ]]; then
|
||||
printf %s "$DEFAULT"
|
||||
fi
|
||||
|
||||
if [[ $DEFAULT = no ]]; then
|
||||
return 1
|
||||
|
@ -477,7 +481,7 @@ on_sys_init_005_log() {
|
|||
# shellcheck disable=SC2155
|
||||
local log_file=$(NS=log state_get log)
|
||||
|
||||
if NS=log state_get overwrite; then
|
||||
if NS=log QUIET="" state_get overwrite; then
|
||||
exec {log_fd}>"$log_file"
|
||||
else
|
||||
exec {log_fd}>>"$log_file"
|
||||
|
@ -570,7 +574,7 @@ on_sys_init_015_net() {
|
|||
NS=net DEFAULT=irc.libera.chat state_resolve server
|
||||
NS=net DEFAULT=no state_resolve tls
|
||||
|
||||
if ! NS=net state_get tls; then
|
||||
if ! NS=net QUIET="" state_get tls; then
|
||||
NS=net DEFAULT=6667 state_resolve port
|
||||
else
|
||||
NS=net DEFAULT=6697 state_resolve port
|
||||
|
@ -585,7 +589,7 @@ on_sys_first_015_net() {
|
|||
local server=$(NS=net state_get server) port=$(NS=net state_get port)
|
||||
log_info "rowbot is connecting to %s" "$(url)"
|
||||
|
||||
if ! NS=net state_get tls; then
|
||||
if ! NS=net QUIET="" state_get tls; then
|
||||
exec {irc_sock}<>/dev/tcp/"$server"/"$port"
|
||||
NS=net state_put in-sock "$irc_sock"
|
||||
NS=net state_put out-sock "$irc_sock"
|
||||
|
|
Loading…
Reference in New Issue