Merge pull request moby#21098 from kencochrane/fix_vendoring_script_macosx

cpuguy83 · cpuguy83 · commit 9ad946eded6f · 2016-03-10T22:45:55.000-05:00
Fix the vendoring script on MacOS X
diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh
@@ -141,6 +141,10 @@ clean() {
 	echo -n 'pruning unused files, '
 	$find vendor -type f -name '*_test.go' -exec rm -v '{}' ';'
 
+	# These are the files that are left over after fix_rewritten_imports is run.
+	echo -n 'pruning .orig files, '
+	$find vendor -type f -name '*.orig' -exec rm -v '{}' ';'
+
 	echo done
 }
 
@@ -151,5 +155,5 @@ fix_rewritten_imports () {
        local target="vendor/src/$pkg"
 
        echo "$pkg: fixing rewritten imports"
-       $find "$target" -name \*.go -exec sed -i -e "s|\"${remove}|\"|g" {} \;
+       $find "$target" -name \*.go -exec sed -i'.orig' -e "s|\"${remove}|\"|g" {} \;
 }

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,10 @@ clean() {`
`141`	`141`	`echo -n 'pruning unused files, '`
`142`	`142`	`$find vendor -type f -name '*_test.go' -exec rm -v '{}' ';'`
`143`	`143`
	`144`	`+ # These are the files that are left over after fix_rewritten_imports is run.`
	`145`	`+ echo -n 'pruning .orig files, '`
	`146`	`+ $find vendor -type f -name '*.orig' -exec rm -v '{}' ';'`
	`147`	`+`
`144`	`148`	`echo done`
`145`	`149`	`}`
`146`	`150`
`@@ -151,5 +155,5 @@ fix_rewritten_imports () {`
`151`	`155`	`local target="vendor/src/$pkg"`
`152`	`156`
`153`	`157`	`echo "$pkg: fixing rewritten imports"`
`154`		`- $find "$target" -name \*.go -exec sed -i -e "s\|\"${remove}\|\"\|g" {} \;`
	`158`	`+ $find "$target" -name \*.go -exec sed -i'.orig' -e "s\|\"${remove}\|\"\|g" {} \;`
`155`	`159`	`}`