From 2b6bacad9bcde5b29d7424f4538b557342ab0044 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 20 Aug 2017 21:40:04 +0100 Subject: [PATCH] minor message updates --- lgsm/functions/alert_email.sh | 10 +++++----- lgsm/functions/alert_telegram.sh | 10 +++++----- lgsm/functions/command_debug.sh | 2 +- lgsm/functions/command_details.sh | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index 0fb99223d..49f8c3136 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -34,7 +34,7 @@ fn_details_os(){ echo -e "Distro: ${distroname}" echo -e "Arch: ${arch}" echo -e "Kernel: ${kernel}" - echo -e "Hostname: $HOSTNAME" + echo -e "Hostname: ${HOSTNAME}" echo -e "tmux: ${tmuxv}" echo -e "GLIBC: ${glibcversion}" } | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}" > /dev/null 2>&1 @@ -235,9 +235,9 @@ else fi exitcode=$? if [ "${exitcode}" == "0" ]; then - fn_print_ok_nl "Sending alert: ${email}" - fn_script_log_pass "Sending alert: ${email}" + fn_print_ok_nl "Sending Email alert: ${email}" + fn_script_log_pass "Sending Email alert: ${email}" else - fn_print_fail_nl "Sending alert: ${email}" - fn_script_log_fatal "Sending alert: ${email}" + fn_print_fail_nl "Sending Email alert: ${email}" + fn_script_log_fatal "Sending Email alert: ${email}" fi \ No newline at end of file diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh index ad94fb3ed..ed7477fbf 100644 --- a/lgsm/functions/alert_telegram.sh +++ b/lgsm/functions/alert_telegram.sh @@ -21,12 +21,12 @@ EOF fn_print_dots "Sending Telegram Alert" sleep 0.5 -telegramsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """$json""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" | grep -Po '(?<="description":").*?(?=")'|uniq) +telegramsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" | grep -Po '(?<="description":").*?(?=")'|uniq) if [ -n "${telegramsend}" ]; then - fn_print_fail_nl "Sending Telegram Alert: ${telegramsend}" - fn_script_log_fatal "Sending Telegram Alert: ${telegramsend}" + fn_print_fail_nl "Sending Telegram alert: ${telegramsend}" + fn_script_log_fatal "Sending Telegram alert: ${telegramsend}" else - fn_print_ok_nl "Sending Telegram Alert" - fn_script_log_pass "Sent Telegram Alert" + fn_print_ok_nl "Sending Telegram alert" + fn_script_log_pass "Sent Telegram alert" fi diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 5fcd1f6fd..0ff223a50 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -29,7 +29,7 @@ fn_print_header echo -e "${blue}Distro:\t${default}${distroname}" echo -e "${blue}Arch:\t${default}${arch}" echo -e "${blue}Kernel:\t${default}${kernel}" -echo -e "${blue}Hostname:\t${default}$HOSTNAME" +echo -e "${blue}Hostname:\t${default}${HOSTNAME}" echo -e "${blue}tmux:\t${default}${tmuxv}" echo -e "${blue}Avg Load:\t${default}${load}" echo -e "${blue}Free Memory:\t${default}${physmemfree}" diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 80b8244d1..7fbe479c1 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -30,7 +30,7 @@ fn_details_os(){ echo -e "${blue}Distro:\t${default}${distroname}" echo -e "${blue}Arch:\t${default}${arch}" echo -e "${blue}Kernel:\t${default}${kernel}" - echo -e "${blue}Hostname:\t${default}$HOSTNAME" + echo -e "${blue}Hostname:\t${default}${HOSTNAME}" echo -e "${blue}tmux:\t${default}${tmuxv}" echo -e "${blue}GLIBC:\t${default}${glibcversion}" } | column -s $'\t' -t