commit: 75966274a95160cabba4534f47867be90648f066 Author: Mike Frysinger <vapier <AT> chromium <DOT> org> AuthorDate: Mon Oct 4 21:51:13 2021 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Mon Oct 4 21:51:13 2021 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=75966274
build: drop external function.sh use We use very little from it anymore, and can easily inline the few things we want. This makes code work on non-Gentoo systems. Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> make-tarball.sh | 7 ++----- tests/lib.sh | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/make-tarball.sh b/make-tarball.sh index 3cd3219..231cb66 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -5,12 +5,9 @@ set -e -if ! . /etc/init.d/functions.sh 2>/dev/null ; then - einfo() { printf ' * %b\n' "$*"; } - eerror() { einfo "$@" 1>&2; } -fi +einfo() { printf ' * %b\n' "$*"; } +eerror() { einfo "$@" 1>&2; } die() { eerror "$@"; exit 1; } - v() { printf '\t%s\n' "$*"; "$@"; } : ${MAKE:=make} diff --git a/tests/lib.sh b/tests/lib.sh index 927e503..03d9f2a 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -9,7 +9,9 @@ else top_builddir=${abs_top_builddir} fi -[ -e /etc/init.d/functions.sh ] && source /etc/init.d/functions.sh +GOOD=$'\e[32;1m' +BAD=$'\e[31;1m' +NORMAL=$'\e[m' PATH="${top_srcdir}:${top_builddir}:${PATH}" unset ROOT # who knows!