diff --git a/seqs/freeradius.sh b/seqs/freeradius.sh index 83ec87b..aab64f4 100755 --- a/seqs/freeradius.sh +++ b/seqs/freeradius.sh @@ -59,7 +59,7 @@ step_52() { fi case "$lAnswer" in [yY]) - info -n " [I] Reseting DB...";; + sqr::echo -n " [I] Reseting DB...";; *) info -e "Abort reset" return 1;; diff --git a/seqs/gitea.sh b/seqs/gitea.sh index cb60c39..b33d2c4 100755 --- a/seqs/gitea.sh +++ b/seqs/gitea.sh @@ -108,8 +108,8 @@ step_4() { exe chmod 770 $SEQ_GITEA_CONF_DIR info "Creating $giteaLogDir" exe install -g $SEQ_GITEA_USER -m 770 -d "$giteaLogDir" - info -n "Copying gitea to global location and making it executable..." - exe install -b -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" && echo "ok" + sqr::echo -n "Copying gitea to global location and making it executable..." + exe install -b -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" && sqr::echo "ok" endReturn "Failed to install $SEQ_GITEA_BIN_LOC" } @@ -184,8 +184,8 @@ step_12() { exe service gitea stop saveReturn $? endReturn - info -n "Backing up existing executable to ${toolBackup}..." - exe cp -ar "$SEQ_GITEA_BIN_LOC" "$toolBackup" && info "ok" || info "nok" + sqr::echo -n "Backing up existing executable to ${toolBackup}..." + exe cp -ar "$SEQ_GITEA_BIN_LOC" "$toolBackup" && sqr::echo "ok" || sqr::echo "nok" fi exe install --backup=none -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" endReturn -o $? "Upgrade failed" diff --git a/seqs/librenms.sh b/seqs/librenms.sh index 482807f..3d7a324 100755 --- a/seqs/librenms.sh +++ b/seqs/librenms.sh @@ -184,8 +184,8 @@ NGINXCONF_END step_20_info() { echo "Create $toolName cron job"; } step_20_alias() { echo "cron"; } step_20() { - info -n " [I] Creating $lnmsCronLoc ... " - exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && info "Ok" || info "Nok" + sqr::echo -n " [I] Creating $lnmsCronLoc ... " + exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && sqr::echo "Ok" || sqr::echo "Nok" } lnmsCronLoc="/etc/cron.d/librenms" @@ -201,8 +201,8 @@ lnmsLocalBin="/usr/local/bin/lnms" step_24_info() { echo "Copy logrotate config"; } step_24_alias() { echo "logrotate"; } step_24() { - info -n " [I] Creating $lnmsLogrotLoc ... " - exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && info "Ok" || info "Nok" + sqr::echo -n " [I] Creating $lnmsLogrotLoc ... " + exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && sqr::echo "Ok" || sqr::echo "Nok" } lnmsLogrotLoc="/etc/logrotate.d/librenms" diff --git a/seqs/webserver.sh b/seqs/webserver.sh index e3c6137..d6bc506 100755 --- a/seqs/webserver.sh +++ b/seqs/webserver.sh @@ -64,8 +64,8 @@ step_3() { # create webroot exe mkdir -p "$siteLetsencryptWww" - info -n "Restarting Nginx..." - exe service nginx restart && info "ok" + sqr::echo -n "Restarting Nginx..." + exe service nginx restart && sqr::echo "ok" endReturn -o $? "Failed to install $serverName" } snippetLetsencryptLoc="/etc/nginx/snippets/letsencrypt.conf" @@ -157,8 +157,8 @@ step_5() { exe sed -i 's/pm.max_spare_servers =.*/pm.max_spare_servers = '$PMaxSS'/' "$phpPoolConfigLocation" exe sed -i "s/;pm.max_requests =.*/pm.max_requests = 1000/" "$phpPoolConfigLocation" - info -n "Restarting ${phpName} ... " - exe service ${phpName}-fpm restart && info "ok" + sqr::echo -n "Restarting ${phpName} ... " + exe service ${phpName}-fpm restart && sqr::echo "ok" } step_6_info() { echo "Installation notes"; }