From 0753acf2f80dead380f4c1996da165c7a23a64e4 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sat, 20 Jun 2015 20:33:44 -0400 Subject: [PATCH] Allow make-ca-cert.sh to run on OS X Currently make-ca-cert.sh uses (equiv of) mktemp -d --tmpdir kube.XXXXX but --tmpdir is not a valid option on OS X. Switch to mktemp -d -t kube.XXXXX Which is valid, but subtly different between OS X and Linux. The directory you get back will be different on each. Linux: ${tmpdir}/kube.y5Bsu/ OS X: ${tmpdir}/kube.XXXXX.VQ81oOui/ --- cluster/saltbase/salt/generate-cert/make-ca-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh index 2e8eb8c2221..c77ca621736 100755 --- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh +++ b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh @@ -46,7 +46,7 @@ if [[ -n "${extra_sans}" ]]; then sans="${sans},${extra_sans}" fi -tmpdir=$(mktemp -d --tmpdir kubernetes_cacert.XXXXXX) +tmpdir=$(mktemp -d -t kubernetes_cacert.XXXXXX) trap 'rm -rf "${tmpdir}"' EXIT cd "${tmpdir}"