Prechádzať zdrojové kódy

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 <kevpar@microsoft.com>
Kevin Parsons 4 rokov pred
rodič
commit
3334fb9af1
2 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 1 1
      hack/validate/vendor
  2. 1 1
      hack/vendor.sh

+ 1 - 1
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"

+ 1 - 1
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