Update hack/vendor.sh to clone directly into vendor/ instead of vendor/src/

Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
This commit is contained in:
Jonathan Yu 2017-01-16 21:51:38 -08:00
parent 3243cf7307
commit 9da2882d49
No known key found for this signature in database
GPG Key ID: F3C2F688A21CB648
2 changed files with 6 additions and 6 deletions

View File

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

View File

@ -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