From 2272de1f67b8abe0e9acda5959bc3ccf7634ad83 Mon Sep 17 00:00:00 2001 From: Michael Nikitochkin Date: Wed, 16 Dec 2015 09:20:57 +0100 Subject: [PATCH] AWS: Fixed compacting script of cloud init for MacOS In MacOS there is error during setup a new cluster: ``` + sed -i -e 's/^[[:blank:]]*#.*$//' -e '/^[[:blank:]]*$/d' /sometmpfile sed: -e: No such file or directory ``` Because sed version of MacOS does not support modern features. --- cluster/aws/util.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 0c6b326fb6a..bd0ac9c40b1 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -895,8 +895,9 @@ function start-master() { # We're running right up against the 16KB limit # Remove all comment lines and then put back the bin/bash shebang - sed -i -e 's/^[[:blank:]]*#.*$//' -e '/^[[:blank:]]*$/d' "${KUBE_TEMP}/master-user-data" - sed -i '1i #! /bin/bash' "${KUBE_TEMP}/master-user-data" + cat "${KUBE_TEMP}/master-user-data" | sed -e 's/^[[:blank:]]*#.*$//' | sed -e '/^[[:blank:]]*$/d' > "${KUBE_TEMP}/master-user-data.tmp" + echo '#! /bin/bash' | cat - "${KUBE_TEMP}/master-user-data.tmp" > "${KUBE_TEMP}/master-user-data" + rm "${KUBE_TEMP}/master-user-data.tmp" echo "Starting Master" master_id=$($AWS_CMD run-instances \