scripts: refactor output formatting functions
Move the common output formatting functions into a separate library file and import that into each script. makepkg is excluded due to its additional color formatting. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
6f3a2145b0
commit
4272b37d3d
|
@ -25,6 +25,7 @@ EXTRA_DIST = \
|
|||
$(LIBRARY)
|
||||
|
||||
LIBRARY = \
|
||||
library/output_format.sh \
|
||||
library/parse_options.sh
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
|
@ -69,13 +70,30 @@ $(OURSCRIPTS): Makefile
|
|||
@chmod a-w $@.tmp
|
||||
@mv $@.tmp $@
|
||||
|
||||
makepkg: $(srcdir)/makepkg.sh.in $(srcdir)/library/parse_options.sh
|
||||
pacman-db-upgrade: $(srcdir)/pacman-db-upgrade.sh.in
|
||||
pacman-key: $(srcdir)/pacman-key.sh.in
|
||||
makepkg: \
|
||||
$(srcdir)/makepkg.sh.in \
|
||||
$(srcdir)/library/parse_options.sh
|
||||
|
||||
pacman-db-upgrade: \
|
||||
$(srcdir)/pacman-db-upgrade.sh.in \
|
||||
$(srcdir)/library/output_format.sh
|
||||
|
||||
pacman-key: \
|
||||
$(srcdir)/pacman-key.sh.in \
|
||||
$(srcdir)/library/output_format.sh
|
||||
|
||||
pacman-optimize: $(srcdir)/pacman-optimize.sh.in
|
||||
pkgdelta: $(srcdir)/pkgdelta.sh.in
|
||||
|
||||
pkgdelta: \
|
||||
$(srcdir)/pkgdelta.sh.in \
|
||||
$(srcdir)/library/output_format.sh
|
||||
|
||||
rankmirrors: $(srcdir)/rankmirrors.sh.in
|
||||
repo-add: $(srcdir)/repo-add.sh.in
|
||||
|
||||
repo-add: \
|
||||
$(srcdir)/repo-add.sh.in \
|
||||
$(srcdir)/library/output_format.sh
|
||||
|
||||
repo-remove: $(srcdir)/repo-add.sh.in
|
||||
rm -f repo-remove
|
||||
$(LN_S) repo-add repo-remove
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
msg() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf "==> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
msg2() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf " -> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
warning() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
|
||||
error() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
|
||||
}
|
|
@ -28,15 +28,8 @@ myver='@PACKAGE_VERSION@'
|
|||
eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
|
||||
dbroot="${DBPath:-@localstatedir@/lib/pacman/}"
|
||||
|
||||
msg() {
|
||||
local mesg=$1; shift
|
||||
printf "==> ${mesg}\n" "$@" >&2
|
||||
}
|
||||
m4_include(library/output_format.sh)
|
||||
|
||||
error () {
|
||||
local mesg=$1; shift
|
||||
printf "==> ERROR: ${mesg}\n" "$@" >&2
|
||||
}
|
||||
usage() {
|
||||
printf "pacman-db-upgrade (pacman) %s\n\n" "$myver"
|
||||
printf "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
|
||||
|
|
|
@ -26,26 +26,7 @@ export TEXTDOMAINDIR='@localedir@'
|
|||
|
||||
myver="@PACKAGE_VERSION@"
|
||||
|
||||
msg() {
|
||||
local mesg=$1; shift
|
||||
printf "==> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
msg2() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf " -> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
warning() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
|
||||
error() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
m4_include(library/output_format.sh)
|
||||
|
||||
usage() {
|
||||
printf "pacman-key (pacman) %s\n" ${myver}
|
||||
|
|
|
@ -34,21 +34,7 @@ QUIET=0
|
|||
# ensure we have a sane umask set
|
||||
umask 0022
|
||||
|
||||
msg() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf "==> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
warning() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
|
||||
error() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
m4_include(library/output_format.sh)
|
||||
|
||||
# print usage instructions
|
||||
usage() {
|
||||
|
|
|
@ -38,27 +38,7 @@ CLEAN_LOCK=0
|
|||
# ensure we have a sane umask set
|
||||
umask 0022
|
||||
|
||||
msg() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf "==> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
msg2() {
|
||||
(( QUIET )) && return
|
||||
local mesg=$1; shift
|
||||
printf " -> ${mesg}\n" "$@" >&1
|
||||
}
|
||||
|
||||
warning() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
|
||||
error() {
|
||||
local mesg=$1; shift
|
||||
printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
|
||||
}
|
||||
m4_include(library/output_format.sh)
|
||||
|
||||
# print usage instructions
|
||||
usage() {
|
||||
|
|
Loading…
Reference in New Issue