mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-02-20 21:46:57 +00:00
abuild: make color work again
by sourcing the functions.sh after abuild.conf
This commit is contained in:
parent
cf3b0ebb4c
commit
cd65e27f8c
27
abuild
27
abuild
@ -10,20 +10,6 @@
|
||||
|
||||
abuild_ver=1.5
|
||||
|
||||
# source functions
|
||||
# if abuild was not run from PATH, then look for func lib at same location
|
||||
if [ -z "$FUNCLIB" ]; then
|
||||
FUNCLIB="${0##/*}/functions.sh"
|
||||
[ -f "$FUNCLIB" ] || FUNCLIB=/usr/share/abuild/functions.sh
|
||||
fi
|
||||
|
||||
if ! [ -f "$FUNCLIB" ]; then
|
||||
echo "$FUNCLIB: not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
. "$FUNCLIB"
|
||||
|
||||
|
||||
startdir="$PWD"
|
||||
srcdir=${srcdir:-"$startdir/src"}
|
||||
pkgdir=${pkgdir:-"$startdir/pkg"}
|
||||
@ -47,6 +33,19 @@ if [ -n "$REPODEST" ]; then
|
||||
PKGDEST="$REPODEST/$repo"
|
||||
fi
|
||||
|
||||
# source functions
|
||||
# if abuild was not run from PATH, then look for func lib at same location
|
||||
if [ -z "$FUNCLIB" ]; then
|
||||
FUNCLIB="${0##/*}/functions.sh"
|
||||
[ -f "$FUNCLIB" ] || FUNCLIB=/usr/share/abuild/functions.sh
|
||||
fi
|
||||
|
||||
if ! [ -f "$FUNCLIB" ]; then
|
||||
echo "$FUNCLIB: not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
. "$FUNCLIB"
|
||||
|
||||
set_xterm_title() {
|
||||
if [ "$TERM" = xterm ]; then
|
||||
printf "\033]0;$1\007" >&2
|
||||
|
Loading…
Reference in New Issue
Block a user