aboutsummaryrefslogtreecommitdiff
path: root/ci/test/04_install.sh
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-11-22 13:58:53 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-11-22 13:57:55 -0500
commitfad88e6f86d1dd32cf01db2287df9c63e66c5116 (patch)
tree5204b698fcb948fdcf7b211219fc6e454c3f0513 /ci/test/04_install.sh
parentfa2941bbf47a8a6b79b8db4a87e1aedcf6a29a5e (diff)
ci: Remove use of cd
Diffstat (limited to 'ci/test/04_install.sh')
-rwxr-xr-xci/test/04_install.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index 20e7ad4a14..2a1983b1c5 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -44,6 +44,8 @@ elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (A
DOCKER_ADMIN="--cap-add SYS_PTRACE"
fi
+export P_CI_DIR="$PWD"
+
if [ -z "$RUN_CI_ON_HOST" ]; then
echo "Creating $DOCKER_NAME_TAG container to run in"
${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG"
@@ -57,12 +59,12 @@ if [ -z "$RUN_CI_ON_HOST" ]; then
$DOCKER_NAME_TAG)
DOCKER_EXEC () {
- docker exec $DOCKER_ID bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $PWD && $*"
+ docker exec $DOCKER_ID bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"
}
else
echo "Running on host system without docker wrapper"
DOCKER_EXEC () {
- bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $PWD && $*"
+ bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"
}
fi