Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx

Fix the vendoring script on MacOS X
This commit is contained in:
Brian Goff 2016-03-10 22:45:55 -05:00
commit 9ad946eded
1 changed files with 5 additions and 1 deletions

View File

@ -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" {} \;
}