github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12008 from smarterclayton/fix_mac

Browse Source 
mktemp on OSX behaves differently than Linux
This commit is contained in:
Dawn Chen 2015-08-05 15:17:59 -07:00
commit a90075d7eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/etcd.sh
View File

@ -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=$!

2
hack/lib/util.sh
View File

@ -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
}