From 1a64830ef149df1dcd9cbe75785d0c7119a0c476 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 30 Jul 2015 00:41:20 -0400
Subject: [PATCH] mktemp on OSX behaves differently than Linux

hack/test-integration and hack/test-cmd are currently broken
---
 hack/lib/etcd.sh | 2 +-
 hack/lib/util.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 581b9265baa..a9b888df9cf 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -39,7 +39,7 @@ kube::etcd::start() {
   fi
 
   # Start etcd
-  ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
+  ETCD_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t test-etcd.XXXXXX)
   kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
   etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
   ETCD_PID=$!
diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index 1c276e111c6..38ae262dcc2 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -54,7 +54,7 @@ kube::util::wait_for_url() {
 #   KUBE_TEMP
 kube::util::ensure-temp-dir() {
   if [[ -z ${KUBE_TEMP-} ]]; then
-    KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
+    KUBE_TEMP=$(mktemp -d 2>/dev/null || mktemp -d -t kubernetes.XXXXXX)
   fi
 }