Use slightly more defensive COPY parsing

tianon · tianon · commit e39d62579f23 · 2019-08-14T16:16:23.000-07:00
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -36,15 +36,19 @@ dirCommit() {
 	local dir="$1"; shift
 	(
 		cd "$dir"
-		fileCommit \
-			Dockerfile \
-			$(git show HEAD:./Dockerfile | awk '
+		files="$(
+			git show HEAD:./Dockerfile | awk '
 				toupper($1) == "COPY" {
 					for (i = 2; i < NF; i++) {
+						if ($i ~ /^--from=/) {
+							next
+						}
 						print $i
 					}
 				}
-			')
+			'
+		)"
+		fileCommit Dockerfile $files
 	)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,15 +36,19 @@ dirCommit() {`
`36`	`36`	`local dir="$1"; shift`
`37`	`37`	`(`
`38`	`38`	`cd "$dir"`
`39`		`- fileCommit \`
`40`		`- Dockerfile \`
`41`		`- $(git show HEAD:./Dockerfile \| awk '`
	`39`	`+ files="$(`
	`40`	`+ git show HEAD:./Dockerfile \| awk '`
`42`	`41`	`toupper($1) == "COPY" {`
`43`	`42`	`for (i = 2; i < NF; i++) {`
	`43`	`+ if ($i ~ /^--from=/) {`
	`44`	`+ next`
	`45`	`+ }`
`44`	`46`	`print $i`
`45`	`47`	`}`
`46`	`48`	`}`
`47`		`- ')`
	`49`	`+ '`
	`50`	`+ )"`
	`51`	`+ fileCommit Dockerfile $files`
`48`	`52`	`)`
`49`	`53`	`}`
`50`	`54`