From cbfdae88fcde764b0a60190d12881c9945fe2437 Mon Sep 17 00:00:00 2001 From: Brandon Kreisel Date: Sun, 27 Sep 2015 14:44:00 -0400 Subject: [PATCH 1/2] Add Mac compatibility to boulder-start The version of sort that ships with OS X does not support the -V version flag. Emulate that functionality with some sed-fu --- tests/boulder-start.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh index 7ce7dcba4..e8c50633f 100755 --- a/tests/boulder-start.sh +++ b/tests/boulder-start.sh @@ -4,11 +4,16 @@ # ugh, go version output is like: # go version go1.4.2 linux/amd64 -GOVER=`go version | cut -d" " -f3 | cut -do -f2` +GOVER=`go version | cut -d" " -f3 | cut -do -f2` # version comparison function verlte { + if [ `uname` == 'Darwin' ]; then + [ "$1" = "`echo -e \"$1\n$2\" | sed 's/\b\([0-9]\)\b/0\1/g' \ + | sort | sed 's/\b0\([0-9]\)/\1/g' | head -n1`" ] + else [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ] + fi } if ! verlte 1.5 "$GOVER" ; then From b6bbc9e0a29a7b64ecc03b1ffbbccf67cac37238 Mon Sep 17 00:00:00 2001 From: Brandon Kreisel Date: Mon, 28 Sep 2015 17:39:01 -0400 Subject: [PATCH 2/2] Add inline Mac comment --- tests/boulder-start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh index e8c50633f..530f9c598 100755 --- a/tests/boulder-start.sh +++ b/tests/boulder-start.sh @@ -8,6 +8,7 @@ GOVER=`go version | cut -d" " -f3 | cut -do -f2` # version comparison function verlte { + #OS X doesn't support version sorting; emulate with sed if [ `uname` == 'Darwin' ]; then [ "$1" = "`echo -e \"$1\n$2\" | sed 's/\b\([0-9]\)\b/0\1/g' \ | sort | sed 's/\b0\([0-9]\)/\1/g' | head -n1`" ]