efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix 'info -n'

Browse Source
This commit is contained in:
Martin Winkler
2022-05-29 21:12:51 +02:00
parent c6e62725da
commit e014397076
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seqs/freeradius.sh
View File

@@ -59,7 +59,7 @@ step_52() {
fi fi
case "$lAnswer" in case "$lAnswer" in
[yY]) [yY])
info -n " [I] Reseting DB...";; sqr::echo -n " [I] Reseting DB...";;
*) *)
info -e "Abort reset" info -e "Abort reset"
return 1;; return 1;;

8
seqs/gitea.sh
View File

@@ -108,8 +108,8 @@ step_4() {
exe chmod 770 $SEQ_GITEA_CONF_DIR exe chmod 770 $SEQ_GITEA_CONF_DIR
info "Creating $giteaLogDir" info "Creating $giteaLogDir"
exe install -g $SEQ_GITEA_USER -m 770 -d "$giteaLogDir" exe install -g $SEQ_GITEA_USER -m 770 -d "$giteaLogDir"
info -n "Copying gitea to global location and making it executable..." sqr::echo -n "Copying gitea to global location and making it executable..."
exe install -b -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" && echo "ok" exe install -b -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" && sqr::echo "ok"
endReturn "Failed to install $SEQ_GITEA_BIN_LOC" endReturn "Failed to install $SEQ_GITEA_BIN_LOC"
} }
@@ -184,8 +184,8 @@ step_12() {
exe service gitea stop exe service gitea stop
saveReturn $? saveReturn $?
endReturn endReturn
info -n "Backing up existing executable to ${toolBackup}..." sqr::echo -n "Backing up existing executable to ${toolBackup}..."
exe cp -ar "$SEQ_GITEA_BIN_LOC" "$toolBackup" && info "ok" || info "nok" exe cp -ar "$SEQ_GITEA_BIN_LOC" "$toolBackup" && sqr::echo "ok" || sqr::echo "nok"
fi fi
exe install --backup=none -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC" exe install --backup=none -m 755 -T "$giteaDownFile" "$SEQ_GITEA_BIN_LOC"
endReturn -o $? "Upgrade failed" endReturn -o $? "Upgrade failed"

8
seqs/librenms.sh
View File

@@ -184,8 +184,8 @@ NGINXCONF_END
step_20_info() { echo "Create $toolName cron job"; } step_20_info() { echo "Create $toolName cron job"; }
step_20_alias() { echo "cron"; } step_20_alias() { echo "cron"; }
step_20() { step_20() {
info -n " [I] Creating $lnmsCronLoc ... " sqr::echo -n " [I] Creating $lnmsCronLoc ... "
exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && info "Ok" || info "Nok" exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && sqr::echo "Ok" || sqr::echo "Nok"
} }
lnmsCronLoc="/etc/cron.d/librenms" lnmsCronLoc="/etc/cron.d/librenms"
@@ -201,8 +201,8 @@ lnmsLocalBin="/usr/local/bin/lnms"
step_24_info() { echo "Copy logrotate config"; } step_24_info() { echo "Copy logrotate config"; }
step_24_alias() { echo "logrotate"; } step_24_alias() { echo "logrotate"; }
step_24() { step_24() {
info -n " [I] Creating $lnmsLogrotLoc ... " sqr::echo -n " [I] Creating $lnmsLogrotLoc ... "
exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && info "Ok" || info "Nok" exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && sqr::echo "Ok" || sqr::echo "Nok"
} }
lnmsLogrotLoc="/etc/logrotate.d/librenms" lnmsLogrotLoc="/etc/logrotate.d/librenms"

8
seqs/webserver.sh
View File

@@ -64,8 +64,8 @@ step_3() {
# create webroot # create webroot
exe mkdir -p "$siteLetsencryptWww" exe mkdir -p "$siteLetsencryptWww"
info -n "Restarting Nginx..." sqr::echo -n "Restarting Nginx..."
exe service nginx restart && info "ok" exe service nginx restart && sqr::echo "ok"
endReturn -o $? "Failed to install $serverName" endReturn -o $? "Failed to install $serverName"
} }
snippetLetsencryptLoc="/etc/nginx/snippets/letsencrypt.conf" 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_spare_servers =.*/pm.max_spare_servers = '$PMaxSS'/' "$phpPoolConfigLocation"
exe sed -i "s/;pm.max_requests =.*/pm.max_requests = 1000/" "$phpPoolConfigLocation" exe sed -i "s/;pm.max_requests =.*/pm.max_requests = 1000/" "$phpPoolConfigLocation"
info -n "Restarting ${phpName} ... " sqr::echo -n "Restarting ${phpName} ... "
exe service ${phpName}-fpm restart && info "ok" exe service ${phpName}-fpm restart && sqr::echo "ok"
} }
step_6_info() { echo "Installation notes"; } step_6_info() { echo "Installation notes"; }