From 5246582266eb7002293051b876be231a0d39f3e0 Mon Sep 17 00:00:00 2001 From: Graham Whaley Date: Thu, 6 Dec 2018 10:08:56 -0800 Subject: [PATCH] setup: fix whitespace we had a bunch of 2-space indents - convert to tabs to match the rest of the file. Signed-off-by: Graham Whaley --- clr-k8s-examples/setup_system.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/clr-k8s-examples/setup_system.sh b/clr-k8s-examples/setup_system.sh index 5f7d7b9..dd69d92 100755 --- a/clr-k8s-examples/setup_system.sh +++ b/clr-k8s-examples/setup_system.sh @@ -54,26 +54,26 @@ sudo modprobe br_netfilter vhost_vsock overlay set +o nounset if [[ ${http_proxy} ]] || [[ ${HTTP_PROXY} ]]; then - echo "Setting up proxy stuff...." - # Setup IP for users too - sed_val=${ADD_NO_PROXY//\//\\/} - [ -f /etc/environment ] && sudo sed -i "/no_proxy/I s/$/,${sed_val}/g" /etc/environment - if [ -f /etc/profile.d/proxy.sh ]; then - sudo sed -i "/no_proxy/I s/\"$/,${sed_val}\"/g" /etc/profile.d/proxy.sh - else - echo "Warning, failed to find /etc/profile.d/proxy.sh to edit no_proxy line" - fi + echo "Setting up proxy stuff...." + # Setup IP for users too + sed_val=${ADD_NO_PROXY//\//\\/} + [ -f /etc/environment ] && sudo sed -i "/no_proxy/I s/$/,${sed_val}/g" /etc/environment + if [ -f /etc/profile.d/proxy.sh ]; then + sudo sed -i "/no_proxy/I s/\"$/,${sed_val}\"/g" /etc/profile.d/proxy.sh + else + echo "Warning, failed to find /etc/profile.d/proxy.sh to edit no_proxy line" + fi - services=('crio' 'docker' 'kubelet') - for s in "${services[@]}"; do - sudo mkdir -p "/etc/systemd/system/${s}.service.d/" - cat << EOF | sudo bash -c "cat > /etc/systemd/system/${s}.service.d/proxy.conf" + services=('crio' 'docker' 'kubelet') + for s in "${services[@]}"; do + sudo mkdir -p "/etc/systemd/system/${s}.service.d/" + cat << EOF | sudo bash -c "cat > /etc/systemd/system/${s}.service.d/proxy.conf" [Service] Environment="HTTP_PROXY=${http_proxy}" Environment="HTTPS_PROXY=${https_proxy}" Environment="SOCKS_PROXY=${socks_proxy}" Environment="NO_PROXY=${no_proxy},${ADD_NO_PROXY}" EOF - done + done fi set -o nounset