From 440625a742b04739dfd4879e226e305f83c0a83e Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Tue, 17 Jan 2023 00:43:16 -0800 Subject: [PATCH] Fix timestamp not reflecting start of task --- install.sh | 3 ++- src/1-logr.sh | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index ebf662f..c6a88ca 100755 --- a/install.sh +++ b/install.sh @@ -14,6 +14,7 @@ if ! [[ ":$PATH:" == *":$_target:"* ]]; then fi cd .. if ! ls -lah "${_target}/clone-all" >/dev/null; then - echo "installation failed somehow" + echo "installation failed somehow, clone-all should have existed at ${_target}/clone-all" + exit fi echo "clone-all installed to: ${_target}/clone-all" diff --git a/src/1-logr.sh b/src/1-logr.sh index 807ea53..f0a76ea 100644 --- a/src/1-logr.sh +++ b/src/1-logr.sh @@ -9,6 +9,8 @@ LNOPE="\e[31mError\e[0m" FATAL="\e[1;31m" RESET="\e[0m" LAST="" +LAST_TIME="" + function _t() { echo -e "\e[90m[$(date -u +'%H:%M:%S')]${RESET}" } @@ -17,21 +19,24 @@ function cln() { echo "$*" | sed -z 's|\n| |g' } function log() { + LAST_TIME="$(_t)" LAST="${*}..." - echo -ne "$(cln "$(_t) ${LFOOB} ${LAST}")" + echo -ne "$(cln "${LAST_TIME} ${LFOOB} ${LAST}")" } function log0() { - echo -ne "\r$(cln "$(_t) ${LPLUS} ${LAST}${LWOOT}${RESET}")\n" + echo -ne "\r$(cln "${LAST_TIME} ${LPLUS} ${LAST}${LWOOT}${RESET}")\n" LAST="" + LAST_TIME="" } function log1() { - echo -ne "\r$(cln "$(_t) ${LFAIL} ${LAST}${LNOPE}${RESET}")\n" + echo -ne "\r$(cln "${LAST_TIME} ${LFAIL} ${LAST}${LNOPE}${RESET}")\n" LAST="" + LAST_TIME="" } function log2() { NEW="${LAST//Cloning/Updating}${REDIR}${RESET}" - echo -ne "\r$(cln "$(_t) ${LFOOB} ${NEW}")" - LAST=$NEW + echo -ne "\r$(cln "${LAST_TIME} ${LFOOB} ${NEW}")" + LAST="$NEW" } function logln() { echo -e "$(_t) ${LFOOB} ${*}"