From f365bd5d60d9d5b82e02db17e615380bf37a74de Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Wed, 8 Mar 2017 12:38:22 +0200 Subject: [PATCH] filter: match $TEST_* $SCRATCH_* in beginning of path string For example, if $TEST_DIR=/mnt, only replace instacnes of /mnt that are in the beginning of a path string, e.g.: "/mnt/mntA/mntB:/mnt/mntC" => "TEST_DIR/mntA/mntB:TEST_DIR/mntC" Signed-off-by: Amir Goldstein --- common/filter | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/filter b/common/filter index 1ceb346..2509483 100644 --- a/common/filter +++ b/common/filter @@ -283,13 +283,13 @@ _filter_test_dir() if ( echo $TEST_DIR | grep -q $TEST_DEV ); then # TEST_DEV is substr of TEST_DIR (e.g. /mnt and /mnt/ovl-mnt) # substitute TEST_DIR first - sed -e "s,$TEST_DIR,TEST_DIR,g" \ - -e "s,$TEST_DEV,TEST_DEV,g" + sed -e "s,\B$TEST_DIR,TEST_DIR,g" \ + -e "s,\B$TEST_DEV,TEST_DEV,g" else # TEST_DIR maybe a substr of TEST_DIR (e.g. /vdc and /dev/vdc) # substitute TEST_DEV first - sed -e "s,$TEST_DEV,TEST_DEV,g" \ - -e "s,$TEST_DIR,TEST_DIR,g" + sed -e "s,\B$TEST_DEV,TEST_DEV,g" \ + -e "s,\B$TEST_DIR,TEST_DIR,g" fi } @@ -297,13 +297,13 @@ _filter_scratch() { if ( echo $SCRATCH_MNT | grep -q $SCRATCH_DEV ); then # SCRATCH_DEV is substr of SCRATCH_MNT - sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ - -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ + sed -e "s,\B$SCRATCH_MNT,SCRATCH_MNT,g" \ + -e "s,\B$SCRATCH_DEV,SCRATCH_DEV,g" \ -e "/.use_space/d" else # SCRATCH_MNT maybe a substr of SCRATCH_DEV - sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ - -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ + sed -e "s,\B$SCRATCH_DEV,SCRATCH_DEV,g" \ + -e "s,\B$SCRATCH_MNT,SCRATCH_MNT,g" \ -e "/.use_space/d" fi } -- 2.7.4