add server name to output messages

This commit is contained in:
Aaron Bieber 2019-09-24 06:30:27 -06:00
parent 41ea605936
commit 8416a94888
Signed by: qbit
GPG Key ID: 279160AB1BE1236B

View File

@ -71,7 +71,7 @@ msg() {
_level=$1 _level=$1
_msg=$2 _msg=$2
if [ $VERBOSITY -ge $_level ] && [ $DRY == 0 ]; then if [ $VERBOSITY -ge $_level ] && [ $DRY == 0 ]; then
echo "==> $_msg" echo "==> ${SERVER} -> $_msg"
fi fi
} }
@ -159,7 +159,7 @@ _ssh() {
V=$(expand_v) V=$(expand_v)
if [ -f ./files ]; then if [ -f ./files ]; then
msg 0 "Installing files" msg 0 "Installing $(wc -l files | awk '{print $1 " " $2}')"
for file in $(cat files); do for file in $(cat files); do
local _src _dest _mode _owner _group local _src _dest _mode _owner _group
read _src _owner _group _mode _dest <<EOF read _src _owner _group _mode _dest <<EOF
@ -176,7 +176,7 @@ EOF
fi fi
if [ -f ./services ]; then if [ -f ./services ]; then
msg 0 "Enabling services" msg 0 "Enabling services $(wc -l services | awk '{print $1 " " $2}')"
for service in $(cat services); do for service in $(cat services); do
msg 1 "\tenabling/restarting ${service}" msg 1 "\tenabling/restarting ${service}"
cmd="$(printf "$SERVICE_START_RESTART" \ cmd="$(printf "$SERVICE_START_RESTART" \