Commit a90075d7 authored by Dawn Chen's avatar Dawn Chen

Merge pull request #12008 from smarterclayton/fix_mac

mktemp on OSX behaves differently than Linux
parents 9a29583f 1a64830e
...@@ -39,7 +39,7 @@ kube::etcd::start() { ...@@ -39,7 +39,7 @@ kube::etcd::start() {
fi fi
# Start etcd # 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" 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 -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$! ETCD_PID=$!
......
...@@ -54,7 +54,7 @@ kube::util::wait_for_url() { ...@@ -54,7 +54,7 @@ kube::util::wait_for_url() {
# KUBE_TEMP # KUBE_TEMP
kube::util::ensure-temp-dir() { kube::util::ensure-temp-dir() {
if [[ -z ${KUBE_TEMP-} ]]; then 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 fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment