From ed500cfacbcc7e5b9124f70604b6f1a7822624d7 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Fri, 29 Aug 2014 13:51:28 -0700 Subject: [PATCH] Remove dead code now that we are using godep. --- third_party/deps.sh | 22 --------------- third_party/update.sh | 64 ------------------------------------------- 2 files changed, 86 deletions(-) delete mode 100755 third_party/deps.sh delete mode 100755 third_party/update.sh diff --git a/third_party/deps.sh b/third_party/deps.sh deleted file mode 100755 index ad4b9e08504d6..0000000000000 --- a/third_party/deps.sh +++ /dev/null @@ -1,22 +0,0 @@ -TOP_PACKAGES=" - github.com/coreos/go-etcd/etcd - github.com/fsouza/go-dockerclient - github.com/golang/glog - code.google.com/p/goauth2/compute/serviceaccount - code.google.com/p/goauth2/oauth - code.google.com/p/google-api-go-client/compute/v1 - github.com/google/cadvisor -" - -DEP_PACKAGES=" - gopkg.in/v1/yaml - bitbucket.org/kardianos/osext - code.google.com/p/google-api-go-client/googleapi - code.google.com/p/go.net/html - github.com/coreos/go-log/log - github.com/coreos/go-systemd/journal - code.google.com/p/go.net/websocket - github.com/google/gofuzz -" - -PACKAGES="$TOP_PACKAGES $DEP_PACKAGES" diff --git a/third_party/update.sh b/third_party/update.sh deleted file mode 100755 index c7ca102231600..0000000000000 --- a/third_party/update.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -set -e - -if ! git diff-index --quiet HEAD -- || test $(git ls-files --exclude-standard --others third_party/src | wc -l) != 0; then - echo "You can't have any staged files or changes in third_party/src/ in git when updating packages." - echo "Either commit them or unstage them to continue." - exit 1 -fi - -THIRD_PARTY_DIR=$(dirname $0) -cd $THIRD_PARTY_DIR - -. ./deps.sh - -if [ $# -gt 0 ]; then - PACKAGES="$@" -fi - -# Create a temp GOPATH root. It must be an absolute path -mkdir -p ../output/go_dep_update -cd ../output/go_dep_update -TMP_GO_ROOT=$PWD -cd - -export GOPATH=${TMP_GO_ROOT} - -for p in $PACKAGES; do - echo "Fetching $p" - - # this is the target directory - mkdir -p src/$p - - # This will checkout the project into src - go get -u -d $p - - # The go get path - gp=$TMP_GO_ROOT/src/$p - - # Attempt to find the commit hash of the repo - cd $gp - - HEAD= - REL_PATH=$(git rev-parse --show-prefix 2>/dev/null) - if [[ -z "$HEAD" && $REL_PATH != *target/go_dep_update* ]]; then - # Grab the head if it is git - HEAD=$(git rev-parse HEAD) - fi - - # Grab the head if it is mercurial - if [[ -z "$HEAD" ]] && hg root >/dev/null 2>&1; then - HEAD=$(hg id -i) - fi - - cd - - - # Copy the code into the final directory - rsync -a -z -r --exclude '.git/' --exclude '.hg/' $TMP_GO_ROOT/src/$p/ src/$p - - # Make a nice commit about what everything bumped to - git add src/$p - if ! git diff --cached --exit-code > /dev/null 2>&1; then - git commit -m "bump($p): $HEAD" - fi -done