From 58b0b323d934c3cf4127651b981c7c0e24910aad Mon Sep 17 00:00:00 2001 From: merakor Date: Mon, 14 Nov 2022 20:46:22 +0000 Subject: shellspec: fix shellcheck warning messages inside the test file FossilOrigin-Name: f6ed9e242246f0aafbb6f1fc7b33baac368c92c1936ead686c42ed4a0783fc64 --- spec/02_src_spec.sh | 7 ++++--- spec/03_contrib_spec.sh | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spec/02_src_spec.sh b/spec/02_src_spec.sh index 84ed7af..2c20849 100644 --- a/spec/02_src_spec.sh +++ b/spec/02_src_spec.sh @@ -1,7 +1,8 @@ Describe 'Main toolchain' - export PATH=$PWD/src:$PATH - export CPT_ROOT=$PWD/tests/02 - export CPT_PATH=$PWD/tests/repository + PATH=$PWD/src:$PATH + CPT_ROOT=$PWD/tests/02 + CPT_PATH=$PWD/tests/repository + export PATH CPT_ROOT CPT_PATH install_dummy() { CPT_HOOK='' ./src/cpt bi dummy-pkg >/dev/null 2>&1 ;} remove_dummy() { rm -rf "${CPT_ROOT:?}/var" ;} BeforeAll install_dummy diff --git a/spec/03_contrib_spec.sh b/spec/03_contrib_spec.sh index d9fcd30..b3d6df4 100644 --- a/spec/03_contrib_spec.sh +++ b/spec/03_contrib_spec.sh @@ -1,8 +1,9 @@ Describe 'contrib scripts' - export PATH=$PWD/src:$PWD/contrib:$PATH - export CPT_ROOT=$PWD/tests/03 - export CPT_PATH=$PWD/tests/repository - export CPT_COMPRESS='' + PATH=$PWD/src:$PWD/contrib:$PATH + CPT_ROOT=$PWD/tests/03 + CPT_PATH=$PWD/tests/repository + CPT_COMPRESS='' + export PATH CPT_ROOT CPT_PATH CPT_COMPRESS install_tmp() { CPT_HOOK='' ./src/cpt b -y contrib-dummy-pkg >/dev/null 2>&1 CPT_HOOK='' ./src/cpt-install -y contrib-dummy-pkg >/dev/null 2>&1 -- cgit v1.2.3