From 9da2882d496a28a9a7aeda9f61a2fe4d4a519536 Mon Sep 17 00:00:00 2001
From: Jonathan Yu <jawnsy@redhat.com>
Date: Mon, 16 Jan 2017 21:51:38 -0800
Subject: [PATCH] Update hack/vendor.sh to clone directly into vendor/ instead
 of vendor/src/

Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
---
 hack/.vendor-helpers.sh | 8 ++++----
 hack/vendor.sh          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh
index d5086de9..6227f24e 100644
--- a/hack/.vendor-helpers.sh
+++ b/hack/.vendor-helpers.sh
@@ -23,7 +23,7 @@ clone() {
 	local url="$4"
 
 	: ${url:=https://$pkg}
-	local target="vendor/src/$pkg"
+	local target="vendor/$pkg"
 
 	echo -n "$pkg @ $rev: "
 
@@ -84,11 +84,11 @@ clean() {
 	echo -n 'pruning unused packages, '
 	findArgs=(
 		# This directory contains only .c and .h files which are necessary
-		# -path vendor/src/github.com/mattn/go-sqlite3/code
+		# -path vendor/github.com/mattn/go-sqlite3/code
 	)
 	for import in "${imports[@]}"; do
 		[ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or )
-		findArgs+=( -path "vendor/src/$import" )
+		findArgs+=( -path "vendor/$import" )
 	done
 	local IFS=$'\n'
 	local prune=( $($find vendor -depth -type d -not '(' "${findArgs[@]}" ')') )
@@ -108,7 +108,7 @@ clean() {
 fix_rewritten_imports () {
        local pkg="$1"
        local remove="${pkg}/Godeps/_workspace/src/"
-       local target="vendor/src/$pkg"
+       local target="vendor/$pkg"
 
        echo "$pkg: fixing rewritten imports"
        $find "$target" -name \*.go -exec sed -i -e "s|\"${remove}|\"|g" {} \;
diff --git a/hack/vendor.sh b/hack/vendor.sh
index 6247cf81..db4a67cb 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -29,13 +29,13 @@ case $# in
 	exit 0
 	;;
 2)
-	rm -rf "vendor/src/$1"
+	rm -rf "vendor/$1"
 	clone git "$1" "$2"
 	clean
 	exit 0
 	;;
 [34])
-	rm -rf "vendor/src/$2"
+	rm -rf "vendor/$2"
 	clone "$@"
 	clean
 	exit 0