From cfb0406b2e3f25b6810dab39ee28a4e1033f7b1f Mon Sep 17 00:00:00 2001 From: Icarus Sparry Date: Thu, 27 Apr 2017 11:15:28 -0700 Subject: [PATCH] Fix creating test files in subdirectories Allow the filenames to contain directory names Signed-off-by: Icarus Sparry --- test/functional/swupdlib.bash | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/functional/swupdlib.bash b/test/functional/swupdlib.bash index a026a70..1603260 100644 --- a/test/functional/swupdlib.bash +++ b/test/functional/swupdlib.bash @@ -92,7 +92,10 @@ gen_file_plain() { local name="$3" # Add plain text file into a bundle - mkdir -p $DIR/image/$ver/$bundle/$(dirname "$name") + case "$name" in + (*"/"*) mkdir -p "$DIR/image/$ver/$bundle/${name%/*}" ;; + (*) mkdir -p $DIR/image/$ver/$bundle ;; + esac echo "$name" > $DIR/image/$ver/$bundle/"$name" } @@ -102,7 +105,10 @@ gen_file_plain_change() { local name="$3" # Add plain text file into a bundle - mkdir -p $DIR/image/$ver/$bundle/$(dirname "$name") + case "$name" in + (*"/"*) mkdir -p "$DIR/image/$ver/$bundle/${name%/*}" ;; + (*) mkdir -p $DIR/image/$ver/$bundle ;; + esac echo "$ver $name" > $DIR/image/$ver/$bundle/"$name" }