From 3946d9ee666413649745aa74b7dcbd1774bdf09a Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 8 Mar 2017 13:43:51 -0800
Subject: [PATCH] tests,scripts: Simplify bootkube and kubectl binary curling

---
 scripts/get-bootkube |  2 +-
 scripts/get-kubectl  | 13 +++++++------
 tests/smoke/bootkube |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/get-bootkube b/scripts/get-bootkube
index 1f7e6042..3978d56b 100755
--- a/scripts/get-bootkube
+++ b/scripts/get-bootkube
@@ -12,5 +12,5 @@ if [[ ! -f $DEST/bootkube ]]; then
   mkdir -p $DEST
   curl -L -O ${URL}
   tar -C $DEST --strip-components=2 -xzf bootkube.tar.gz bin/linux/bootkube
-  chmod +x ${DEST}
+  chmod +x ${DEST}/bootkube
 fi
diff --git a/scripts/get-kubectl b/scripts/get-kubectl
index e444028d..7b20bd3b 100755
--- a/scripts/get-kubectl
+++ b/scripts/get-kubectl
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
-# USAGE: ./get-kubectl bin/kubectl
+# USAGE: ./get-kubectl bin
 # Get the kubectl client
 set -eu
 
-DEST=${1:-"bin/kubectl"}
+DEST=${1:-"bin"}
 VERSION="v1.5.2"
 
 URL="https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl"
 
-mkdir -p $(dirname $DEST)
-curl -L -o ${DEST} ${URL}
-chmod +x ${DEST}
-
+if [[ ! -f $DEST/kubectl ]]; then
+  mkdir -p ${DEST}
+  curl -L -o ${DEST}/kubectl ${URL}
+  chmod +x ${DEST}/kubectl
+fi
diff --git a/tests/smoke/bootkube b/tests/smoke/bootkube
index caecdfc5..a2e5f279 100755
--- a/tests/smoke/bootkube
+++ b/tests/smoke/bootkube
@@ -8,6 +8,7 @@ main() {
   rm -rf assets
   cleanup
 
+  ./scripts/get-kubectl
   ./scripts/get-bootkube
   ./scripts/devnet create bootkube
   ./scripts/libvirt create