From d215724ad6f70a783cb00b77f3c1a0cf9f69c83e Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf Date: Thu, 19 Dec 2013 11:01:55 -0600 Subject: [PATCH] add gosqlite to vendor.sh Add gosqlite and its latest revision to vendor.sh so that the vendor directory can be reliably recreated. --- hack/vendor.sh | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index fc0180c538..f76b30bba1 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -6,7 +6,7 @@ if [[ ! -d vendor ]]; then fi vendor_dir=${PWD}/vendor -git_clone () { +rm_pkg_dir () { PKG=$1 REV=$2 ( @@ -16,11 +16,31 @@ git_clone () { echo "src/$PKG already exists. Removing." rm -fr src/$PKG fi + ) +} + +git_clone () { + PKG=$1 + REV=$2 + ( + set -e + rm_pkg_dir $PKG $REV cd $vendor_dir && git clone http://$PKG src/$PKG cd src/$PKG && git checkout -f $REV && rm -fr .git ) } +hg_clone () { + PKG=$1 + REV=$2 + ( + set -e + rm_pkg_dir $PKG $REV + cd $vendor_dir && hg clone http://$PKG src/$PKG + cd src/$PKG && hg checkout -r $REV && rm -fr .hg + ) +} + git_clone github.com/kr/pty 3b1f6487b git_clone github.com/gorilla/context/ 708054d61e5 @@ -29,13 +49,6 @@ git_clone github.com/gorilla/mux/ 9b36453141c git_clone github.com/syndtr/gocapability 3454319be2 -# Docker requires code.google.com/p/go.net/websocket -PKG=code.google.com/p/go.net REV=84a4013f96e0 -( - set -e - cd $vendor_dir - if [[ ! -d src/$PKG ]]; then - hg clone https://$PKG src/$PKG - fi - cd src/$PKG && hg checkout -r $REV -) +hg_clone code.google.com/p/go.net 84a4013f96e0 + +hg_clone code.google.com/p/gosqlite 74691fb6f837