From 3a385a8b0bd17991862c43321fd6785c7d4ee419 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Mon, 24 Nov 2014 11:44:01 -0800 Subject: [PATCH] Squash output from 'which' --- build/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.sh b/build/common.sh index d5916a3d5f73d..08d31d5e0870f 100644 --- a/build/common.sh +++ b/build/common.sh @@ -187,7 +187,7 @@ function kube::build::prepare_output() { # volume mounts. We can work around this by explicitly adding a security # context to the _output directory. # Details: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Resource_Management_and_Linux_Containers_Guide/sec-Sharing_Data_Across_Containers.html#sec-Mounting_a_Host_Directory_to_a_Container - if which selinuxenabled >/dev/null && \ + if which selinuxenabled &>/dev/null && \ selinuxenabled && \ which chcon >/dev/null ; then if [[ ! $(ls -Zd "${LOCAL_OUTPUT_ROOT}") =~ svirt_sandbox_file_t ]] ; then @@ -592,7 +592,7 @@ function kube::release::create_tarball() { # Find gnu tar if it is available local tar=tar - if which gtar > /dev/null; then + if which gtar &>/dev/null; then tar=gtar fi