From 3334fb9af1f366ed69cff9591f890c54398726f7 Mon Sep 17 00:00:00 2001 From: Kevin Parsons Date: Tue, 13 Jul 2021 09:45:07 -0700 Subject: [PATCH] Fix up vndr tooling - Fix the error message in hack/validate/vendor to specify that hack/vendor.sh should be run instead of vndr. - Fix hack/vendor.sh to also match on Windows paths for the whitelist. This allows the script to be run on Windows via Git Bash. Signed-off-by: Kevin Parsons --- hack/validate/vendor | 2 +- hack/vendor.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/validate/vendor b/hack/validate/vendor index 5da3b89715..5d3121b4c9 100755 --- a/hack/validate/vendor +++ b/hack/validate/vendor @@ -21,7 +21,7 @@ validate_vendor_diff(){ echo echo "$diffs" echo - echo 'Please vendor your package with github.com/LK4D4/vndr.' + echo 'Please vendor your package with hack/vendor.sh.' echo if [ -n "$mfiles" ] ; then git diff -- "$mfiles" diff --git a/hack/vendor.sh b/hack/vendor.sh index 67b9f738c2..3abc7b5d99 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -24,5 +24,5 @@ if [ $# -eq 0 ] || [ "$1" = "archive/tar" ]; then fi if [ $# -eq 0 ] || [ "$1" != "archive/tar" ]; then - vndr -whitelist=^archive/tar "$@" + vndr -whitelist='^archive[/\\]tar' "$@" fi