allow override sharedir for testing
Aloow overrid sharedir with global ABUILD_SHAREDIR so we test the local functions.sh instead of a system installed functions.sh
This commit is contained in:
parent
f3dc428ea0
commit
c486b3b4f3
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
abuild_path=$(readlink -f $0)
|
abuild_path=$(readlink -f $0)
|
||||||
git=$(command -v git) || git=true
|
git=$(command -v git) || git=true
|
||||||
|
|
2
abump.in
2
abump.in
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sysconfdir=@sysconfdir@
|
sysconfdir=@sysconfdir@
|
||||||
abuildrepo=/var/lib/buildlab/result
|
abuildrepo=/var/lib/buildlab/result
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
BUILD_BASE="build-base"
|
BUILD_BASE="build-base"
|
||||||
SUDO=${SUDO:-"sudo"}
|
SUDO=${SUDO:-"sudo"}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sharedir=@sharedir@
|
sharedir=${ABUILD_SHAREDIR:-@sharedir@}
|
||||||
|
|
||||||
if ! [ -f "$sharedir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$sharedir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
setup() {
|
setup() {
|
||||||
export ABUILD=../abuild
|
export ABUILD=../abuild
|
||||||
|
export ABUILD_SHAREDIR=$PWD/..
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "help text" {
|
@test "help text" {
|
||||||
|
|
Loading…
Reference in New Issue