diff --git a/src/basic.sh b/src/basic.sh index 5c35690..0c91990 100644 --- a/src/basic.sh +++ b/src/basic.sh @@ -26,7 +26,7 @@ harakiri() { } lsb_release -a 2> /dev/null -echo ; echo ${TEXT_COLOR_GOOD}"- Load:"${TEXT_COLOR_OFF} +echo -e "\n${TEXT_COLOR_GOOD} - Load:${TEXT_COLOR_OFF}\n" nproc=`nproc` la=`cat /proc/loadavg | awk '{print $1, $2, $3}'` @@ -36,7 +36,7 @@ totalmem=`free -m | head -2 | tail -1 | awk '{print $2}'` echo 'LA: ' $la ' of ' $nproc echo 'RAM: ' $usedmem 'Mb of ' $totalmem Mb -echo ${TEXT_COLOR_GOOD} "- Disk:" ${TEXT_COLOR_OFF} +echo -e "${TEXT_COLOR_GOOD} - Disk: ${TEXT_COLOR_OFF}\n" df -h | head -n 1 df -h | grep '/dev/vd' @@ -45,7 +45,7 @@ echo "- Inodes:" df -hi | grep '/dev/vd' -echo ${TEXT_COLOR_GOOD} "- Installed panel:" ${TEXT_COLOR_OFF} +echo -e "${TEXT_COLOR_GOOD} - Installed panel: ${TEXT_COLOR_OFF}\n" #if zero - false [[ -d /opt/webdir/bin/ ]] && echo "Bitrix!" @@ -53,7 +53,7 @@ echo ${TEXT_COLOR_GOOD} "- Installed panel:" ${TEXT_COLOR_OFF} [[ -d /usr/local/mgr5/ ]] && echo "ISPManager!" [[ -d /usr/local/fastpanel2 ]] && echo "Fastpanel 2" -echo ${TEXT_COLOR_GOOD} "- Installed packages" ${TEXT_COLOR_OFF} +echo -e "${TEXT_COLOR_GOOD} - Installed packages: ${TEXT_COLOR_OFF}\n" list=$(apt list --installed 2>&1 |egrep 'atop')