summaryrefslogtreecommitdiff
path: root/scripts/library
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-06-28 13:19:43 -0400
committerAllan McRae <allan@archlinux.org>2018-10-21 20:22:19 +1000
commitb5d62d2c91a2caf5c18945921cdf12af6f36b2d4 (patch)
tree9e127c1174be7a72de4b059c7128990782a5902d /scripts/library
parent3561c872ca0980c76442fcbf3985cc92a8f572f7 (diff)
downloadpacman-b5d62d2c91a2caf5c18945921cdf12af6f36b2d4.tar.xz
Port scripts to use libmakepkg's messaging code.
Remove all remnants of library/{output_format,term_colors}.sh Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/library')
-rw-r--r--scripts/library/README10
-rw-r--r--scripts/library/output_format.sh32
-rw-r--r--scripts/library/term_colors.sh21
3 files changed, 0 insertions, 63 deletions
diff --git a/scripts/library/README b/scripts/library/README
index a9d15f1e..2b3a97bc 100644
--- a/scripts/library/README
+++ b/scripts/library/README
@@ -1,13 +1,6 @@
This directory contains code snippets that can be reused by multiple
scripts. A brief description of each file follows.
-output_format.sh:
-Provides basic output formatting functions with levels 'plain', 'msg',
-'msg2', 'warning' and 'error'. The 'msg' amd 'msg2' functions print to
-stdout and can be silenced by defining 'QUIET'. The 'warning' and 'error'
-functions print to stderr with the appropriate prefix added to the
-message.
-
human_to_size.sh:
A function to convert human readable sizes (such as "5.3 GiB") to raw byte
equivalents. base10 and base2 suffixes are supported, case sensitively. If
@@ -19,6 +12,3 @@ as mawk or busybox awk.
size_to_human.sh:
The reverse of human_to_size, this function takes an integer byte size and
prints its in human readable format, with SI prefixes (e.g. MiB, TiB).
-
-term_colors.sh:
-Contains some common color settings for output_format.sh.
diff --git a/scripts/library/output_format.sh b/scripts/library/output_format.sh
deleted file mode 100644
index 9f02c00b..00000000
--- a/scripts/library/output_format.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-plain() {
- (( QUIET )) && return
- local mesg=$1; shift
- printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1
-}
-
-msg() {
- (( QUIET )) && return
- local mesg=$1; shift
- printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1
-}
-
-msg2() {
- (( QUIET )) && return
- local mesg=$1; shift
- printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1
-}
-
-ask() {
- local mesg=$1; shift
- printf "${BLUE}::${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}" "$@" >&1
-}
-
-warning() {
- local mesg=$1; shift
- printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
- local mesg=$1; shift
- printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
diff --git a/scripts/library/term_colors.sh b/scripts/library/term_colors.sh
deleted file mode 100644
index a675247c..00000000
--- a/scripts/library/term_colors.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# check if messages are to be printed using color
-unset ALL_OFF BOLD BLUE GREEN RED YELLOW
-if [[ -t 2 && ! $USE_COLOR = "n" ]]; then
- # prefer terminal safe colored and bold text when tput is supported
- if tput setaf 0 &>/dev/null; then
- ALL_OFF="$(tput sgr0)"
- BOLD="$(tput bold)"
- BLUE="${BOLD}$(tput setaf 4)"
- GREEN="${BOLD}$(tput setaf 2)"
- RED="${BOLD}$(tput setaf 1)"
- YELLOW="${BOLD}$(tput setaf 3)"
- else
- ALL_OFF="\e[1;0m"
- BOLD="\e[1;1m"
- BLUE="${BOLD}\e[1;34m"
- GREEN="${BOLD}\e[1;32m"
- RED="${BOLD}\e[1;31m"
- YELLOW="${BOLD}\e[1;33m"
- fi
-fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW