Skip to content

Commit

Permalink
Fix diff-pr globbing on images that do "COPY ./..." (like neo4j)
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Apr 9, 2019
1 parent 145627a commit 48c82ce
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion diff-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ copy-tar() {

local globbed
# "find: warning: -path ./xxx/ will not match anything because it ends with /."
globbed=( $(cd "$dDir" && find -path "./${f%/}") )
local findGlobbedPath="${f%/}"
findGlobbedPath="${f#./}"
globbed=( $(cd "$dDir" && find -path "./$findGlobbedPath") )
if [ "${#globbed[@]}" -eq 0 ]; then
globbed=( "$f" )
fi
Expand Down

0 comments on commit 48c82ce

Please sign in to comment.