From a9ae56621f1da71af5703c439c4d9096fce9e41e Mon Sep 17 00:00:00 2001
From: Geoff Greer <geoff@greer.fm>
Date: Thu, 7 Dec 2017 16:11:05 -0800
Subject: [PATCH] Shell cleanup. Fix shellcheck warnings. Remove unused
 environment variable from environment.sh.

---
 contrib/environment.sh | 7 ++++---
 jenkins                | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/contrib/environment.sh b/contrib/environment.sh
index 569e628b489..c0cd041a1fc 100644
--- a/contrib/environment.sh
+++ b/contrib/environment.sh
@@ -16,14 +16,15 @@
 # bridge command line arguments - in fact. to get more information
 # about any of them, you can run ./bin/bridge --help
 
-export BRIDGE_HOST="http://127.0.0.1:9000"
 export BRIDGE_USER_AUTH="disabled"
 export BRIDGE_K8S_MODE="off-cluster"
-export BRIDGE_K8S_MODE_OFF_CLUSTER_ENDPOINT=$(kubectl config view -o json | jq '{myctx: .["current-context"], ctxs: .contexts[], clusters: .clusters[]}' | jq 'select(.myctx == .ctxs.name)' | jq 'select(.ctxs.context.cluster ==  .clusters.name)' | jq '.clusters.cluster.server' -r)
+BRIDGE_K8S_MODE_OFF_CLUSTER_ENDPOINT=$(kubectl config view -o json | jq '{myctx: .["current-context"], ctxs: .contexts[], clusters: .clusters[]}' | jq 'select(.myctx == .ctxs.name)' | jq 'select(.ctxs.context.cluster ==  .clusters.name)' | jq '.clusters.cluster.server' -r)
+export BRIDGE_K8S_MODE_OFF_CLUSTER_ENDPOINT
 export BRIDGE_K8S_MODE_OFF_CLUSTER_SKIP_VERIFY_TLS=true
 export BRIDGE_K8S_AUTH="bearer-token"
 
 secretname=$(kubectl get serviceaccount default --namespace=kube-system -o jsonpath='{.secrets[0].name}')
-export BRIDGE_K8S_AUTH_BEARER_TOKEN=$(kubectl get secret "$secretname" --namespace=kube-system -o template --template='{{.data.token}}' | base64 --decode)
+BRIDGE_K8S_AUTH_BEARER_TOKEN=$(kubectl get secret "$secretname" --namespace=kube-system -o template --template='{{.data.token}}' | base64 --decode)
+export BRIDGE_K8S_AUTH_BEARER_TOKEN
 
 echo "Using $BRIDGE_K8S_MODE_OFF_CLUSTER_ENDPOINT"
diff --git a/jenkins b/jenkins
index 7eadf52fa73..d4eb34a3ddf 100755
--- a/jenkins
+++ b/jenkins
@@ -91,11 +91,11 @@ echo "Cleaning up old Docker images..."
 
 set +e
 # delete stopped containers
-docker rm $(docker ps -a -q)
+docker ps -a -q | xargs docker rm
+# docker rm $(docker ps -a -q)
 
 # delete images except for console builder (fails on images currently used)
-TO_DELETE=$(docker images | grep -F -v quay.io/coreos/tectonic-console-builder | awk '{print $3}' | grep -v IMAGE)
-docker rmi $TO_DELETE
+docker images | grep -F -v quay.io/coreos/tectonic-console-builder | awk '{print $3}' | grep -v IMAGE | xargs docker rmi
 
 # delete orphaned volumes
 docker volume ls -qf dangling=true | xargs -r docker volume rm