From d55af7cd61a4764d1b4db69aac24d10b0970b87c Mon Sep 17 00:00:00 2001 From: Teoh Han Hui Date: Thu, 28 Mar 2019 18:12:47 +0100 Subject: [PATCH] generate-stackbrew-library.sh: Fix detection of deleted files in COPY command --- generate-stackbrew-library.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 18a4dae..ead4e90 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -26,17 +26,18 @@ fileCommit() { # get the most recent commit which modified "$1/Dockerfile" or any file COPY'd from "$1/Dockerfile" dirCommit() { local dir="$1"; shift + local copyPaths; ( cd "$dir" - fileCommit \ - Dockerfile \ - $(git show HEAD:./Dockerfile | awk ' - toupper($1) == "COPY" { - for (i = 2; i < NF; i++) { - print $i - } + IFS=" " read -r -a copyPaths <<< "$(git show HEAD:./Dockerfile | awk ' + BEGIN { ORS=" "; } + toupper($1) == "COPY" { + for (i = 2; i < NF; i++) { + print $i } - ') + } + ')" + fileCommit Dockerfile "${copyPaths[@]}" ) }