github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1773 from VojtechVitek/uname_ostype 

Fix OS X build
pull/6/head
Joe Beda 2014-10-14 09:34:01 -07:00
parent 542ea00d6e b1b9dcc737
commit 2de95cf4e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/common.sh
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
# Copyright 2014 Google Inc. All rights reserved. # Copyright 2014 Google Inc. All rights reserved.
# #
@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Common utilties, variables and checks for all build scripts. # Common utilities, variables and checks for all build scripts.
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
@ -145,7 +145,7 @@ function kube::build::verify_prereqs() {
# Utility functions # Utility functions
function kube::build::is_osx() { function kube::build::is_osx() {
[[ "$OSTYPE" == "darwin"* ]] [[ "$(uname)" == "Darwin" ]]
} }
function kube::build::clean_output() { function kube::build::clean_output() {