Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pax-utils:master commit in: /, tests/
Date: Mon, 04 Oct 2021 22:05:18
Message-Id: 1633384273.75966274a95160cabba4534f47867be90648f066.vapier@gentoo
1 commit: 75966274a95160cabba4534f47867be90648f066
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Mon Oct 4 21:51:13 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 21:51:13 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=75966274
7
8 build: drop external function.sh use
9
10 We use very little from it anymore, and can easily inline the few
11 things we want. This makes code work on non-Gentoo systems.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 make-tarball.sh | 7 ++-----
16 tests/lib.sh | 4 +++-
17 2 files changed, 5 insertions(+), 6 deletions(-)
18
19 diff --git a/make-tarball.sh b/make-tarball.sh
20 index 3cd3219..231cb66 100755
21 --- a/make-tarball.sh
22 +++ b/make-tarball.sh
23 @@ -5,12 +5,9 @@
24
25 set -e
26
27 -if ! . /etc/init.d/functions.sh 2>/dev/null ; then
28 - einfo() { printf ' * %b\n' "$*"; }
29 - eerror() { einfo "$@" 1>&2; }
30 -fi
31 +einfo() { printf ' * %b\n' "$*"; }
32 +eerror() { einfo "$@" 1>&2; }
33 die() { eerror "$@"; exit 1; }
34 -
35 v() { printf '\t%s\n' "$*"; "$@"; }
36
37 : ${MAKE:=make}
38
39 diff --git a/tests/lib.sh b/tests/lib.sh
40 index 927e503..03d9f2a 100644
41 --- a/tests/lib.sh
42 +++ b/tests/lib.sh
43 @@ -9,7 +9,9 @@ else
44 top_builddir=${abs_top_builddir}
45 fi
46
47 -[ -e /etc/init.d/functions.sh ] && source /etc/init.d/functions.sh
48 +GOOD=$'\e[32;1m'
49 +BAD=$'\e[31;1m'
50 +NORMAL=$'\e[m'
51
52 PATH="${top_srcdir}:${top_builddir}:${PATH}"
53 unset ROOT # who knows!