github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1408 from bgrant0607/gcutilfix

Browse Source 
Replace --lines= with -n to fix tail on mac os.
This commit is contained in:
roberthbailey 2014-09-23 07:37:19 -07:00
commit 52500306e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/util.sh
View File

@ -61,7 +61,7 @@ function detect-minions () {
# gcutil will print the "external-ip" column header even if no instances are found
local minion_ip=$(gcutil listinstances --format=csv --sort=external-ip \
--columns=external-ip --zone ${ZONE} --filter="name eq ${MINION_NAMES[$i]}" \
| tail --lines=+2 | tail -n 1)
| tail -n '+2' | tail -n 1)
if [ -z "$minion_ip" ] ; then
echo "Did not find ${MINION_NAMES[$i]}" 1>&2
else
@ -81,7 +81,7 @@ function detect-master () {
# gcutil will print the "external-ip" column header even if no instances are found
KUBE_MASTER_IP=$(gcutil listinstances --format=csv --sort=external-ip \
--columns=external-ip --zone ${ZONE} --filter="name eq ${MASTER_NAME}" \
| tail --lines=+2 | tail -n 1)
| tail -n '+2' | tail -n 1)
fi
if [ -z "$KUBE_MASTER_IP" ]; then
echo "Could not detect Kubernetes master node. Make sure you've launched a cluster with 'kube-up.sh'" 1>&2