From b5d62d2c91a2caf5c18945921cdf12af6f36b2d4 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 28 Jun 2018 13:19:43 -0400 Subject: Port scripts to use libmakepkg's messaging code. Remove all remnants of library/{output_format,term_colors}.sh Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/pacman-db-upgrade.sh.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'scripts/pacman-db-upgrade.sh.in') diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 3945695c..a831f181 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -28,11 +28,10 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver='@PACKAGE_VERSION@' -m4_include(library/output_format.sh) - LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -# Import parseopts.sh +# Import libmakepkg +source "$LIBRARY"/util/message.sh source "$LIBRARY"/util/parseopts.sh usage() { @@ -113,7 +112,12 @@ conffile=${conffile:-@sysconfdir@/pacman.conf} [[ -z $pacroot ]] && pacroot=$(pacman-conf --config="$conffile" rootdir) [[ -z $dbroot ]] && dbroot=$(pacman-conf --config="$conffile" --rootdir="$pacroot" dbpath) -m4_include(library/term_colors.sh) +# check if messages are to be printed using color +if [[ -t 2 && $USE_COLOR != "n" ]]; then + colorize +else + unset ALL_OFF BOLD BLUE GREEN RED YELLOW +fi if [[ ! -d $dbroot ]]; then die "$(gettext "%s does not exist or is not a directory.")" "$dbroot" -- cgit v1.2.3-54-g00ecf