diff --git a/.gitignore b/.gitignore index c493f59..4611488 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.cloudcatcher_settings +.cloudcatcher-settings +*.txt # Created by https://www.gitignore.io/api/git diff --git a/cloudcatcher-info.sh b/cloudcatcher-info.sh index 327c276..315d1c7 100755 --- a/cloudcatcher-info.sh +++ b/cloudcatcher-info.sh @@ -78,10 +78,15 @@ wait echo -e "Welcome to $(cat ${tmpdir}hostname.txt)"; echo -e " ${LC}running $(cat ${tmpdir}distro-description.txt)${RS}"; +echo -e ""; echo -e "Kernel: ${FRED}$(cat ${tmpdir}kernel-version.txt)${RS}"; echo -e "Uptime: ${FGRN}$(cat ${tmpdir}uptime.txt)${RS}"; echo -e "Load: ${FONG}$(cat ${tmpdir}load.txt)${RS}"; -echo -e "IPs: ${FBLE}$(cat ${tmpdir}ips.txt)${RS}"; +echo -e "IPs:"; +echo -e " ${FBLE}$(cat ${tmpdir}ips.txt)${RS}"; +echo -e ""; +echo -e "${LC}Last updated at $(date +"%l:%M%p")${RS}"; +echo -e ""; cat ${tmpdir}apt-packages.txt; cat ${tmpdir}reboot_required.txt; diff --git a/cloudcatcher.sh b/cloudcatcher.sh index 63f2aa8..9b824f4 100755 --- a/cloudcatcher.sh +++ b/cloudcatcher.sh @@ -4,13 +4,13 @@ logo_filename="logo.txt"; info_filename=$(mktemp --suffix -cloudcatcher); -if [ -f .cloudcatcher_settings ]; then - source .cloudcatcher_settings; +if [ -f .cloudcatcher-settings ]; then + source .cloudcatcher-settings; fi ################ -cloudcatcher-info.sh >${info_filename} +./cloudcatcher-info.sh >${info_filename} ### Output ### echo