X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=lib%2Flog.sh;h=d8aea8adb42e2a8e523f8d963a584a8115e6d817;hp=e30296050313cceef9d761b020168442f65acb4d;hb=a11ad78672a096632b15a660509d7dd5f7c5eae5;hpb=0d705d8e2a919ee40866307aa3e18b1a5c4e7583 diff --git a/lib/log.sh b/lib/log.sh index e302960..d8aea8a 100644 --- a/lib/log.sh +++ b/lib/log.sh @@ -1,5 +1,3 @@ -#!/bin/sh - export TERM=${TERM:-linux} readonly tput_rev=${nocolor:-$(tput rev)} readonly tput_sgr0=${nocolor:-$(tput sgr0)} @@ -19,32 +17,10 @@ info () { for var in "$@" do local val="$(eval printf %s "\"\${$var:-}\"" || false)" || false - printf >&2 ": %s%s%s=%s%s%s" "$tput_bold$tput_setaf_0" "$var" "$tput_sgr0" "$tput_bold$tput_setaf_0" "$val" "$tput_sgr0" + printf >&2 ": %s%s%s=%s%s%s" "$tput_bold$tput_setaf_0" "$var" "$tput_sgr0" "$tput_rev" "$val" "$tput_sgr0" done printf >&2 ": %s%s%s\n" "$tput_rev" "$comment" "$tput_sgr0" } -warn () { - local - - set +x - printf >&2 "%sWARNING%s" "$tput_setaf_3" "$tput_sgr0" - local comment="$1" - shift - local var - for var in "$@" - do - local val="$(eval printf %s "\"\${$var:-}\"" || false)" || false - printf >&2 ": %s%s%s=%s%s%s" "$tput_bold$tput_setaf_0" "$var" "$tput_sgr0" "$tput_bold$tput_setaf_0" "$val" "$tput_sgr0" - done - printf >&2 ": %s%s%s" "$tput_rev" "$comment" "$tput_sgr0" - local x - if ! [ ${WARNING_CONTINUE:+set} ] - then - printf >&2 " (press Enter to continue)" - read x - else - printf >&2 "\n" - fi - } error () { local - set +x