Merge branch 'default-then-functions.sh' into 'master'

abuild.in: Set defaults, then source functions.sh

See merge request alpine/abuild!113
This commit is contained in:
Thermi 2024-04-27 23:45:24 +00:00
commit 7256ccdbd5
1 changed files with 6 additions and 6 deletions

View File

@ -16,12 +16,6 @@ abuild_path=$(readlink -f $0)
: ${git:=$(command -v git || echo true)}
export git
if ! [ -f "$sharedir/functions.sh" ]; then
echo "$sharedir/functions.sh: not found" >&2
exit 1
fi
. "$sharedir/functions.sh"
# defaults
: ${FAKEROOT:="fakeroot"}
: ${SUDO_APK:="abuild-apk"}
@ -32,6 +26,12 @@ fi
: ${CXX:="g++"}
: ${SETFATTR:="setfattr"}
if ! [ -f "$sharedir/functions.sh" ]; then
echo "$sharedir/functions.sh: not found" >&2
exit 1
fi
. "$sharedir/functions.sh"
apk_opt_wait="--wait 30"
doc_threshold=$((2 * 1024 * 1024)) # 2 MiB