github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Squash output from 'which'

Browse Source
This commit is contained in:
Joe Beda 2014-11-24 11:44:01 -08:00
parent d5536abdb5
commit 3a385a8b0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@ -187,7 +187,7 @@ function kube::build::prepare_output() {
# volume mounts. We can work around this by explicitly adding a security # volume mounts. We can work around this by explicitly adding a security
# context to the _output directory. # 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 # 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 && \ selinuxenabled && \
which chcon >/dev/null ; then which chcon >/dev/null ; then
if [[ ! $(ls -Zd "${LOCAL_OUTPUT_ROOT}") =~ svirt_sandbox_file_t ]] ; 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 # Find gnu tar if it is available
local tar=tar local tar=tar
if which gtar > /dev/null; then if which gtar &>/dev/null; then
tar=gtar tar=gtar
fi fi