From a68de6237b00bfa43e079276292f8e7d5cc42e5a Mon Sep 17 00:00:00 2001 From: Charles Butler Date: Thu, 26 Mar 2015 16:35:24 -0400 Subject: [PATCH] Rewrote shell script headers with accepted kubernetes boilerplate because of failing build notifications on #5414 --- cluster/juju/prereqs/ubuntu-juju.sh | 11 ++++++----- cluster/juju/util.sh | 9 ++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cluster/juju/prereqs/ubuntu-juju.sh b/cluster/juju/prereqs/ubuntu-juju.sh index 0e63bed47a..d5ffd7c8f9 100644 --- a/cluster/juju/prereqs/ubuntu-juju.sh +++ b/cluster/juju/prereqs/ubuntu-juju.sh @@ -1,8 +1,6 @@ #!/bin/bash -set -euo pipefail - -# Copyright 2014 Canonical LTD. All rights reserved. +# Copyright 2015 Google Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,8 +14,11 @@ set -euo pipefail # See the License for the specific language governing permissions and # limitations under the License. -# If you find any bugs within this script - please file bugs against the -# Kubernetes Juju Charms project - located here: https://github.com/whitmo/bundle-kubernetes + +set -o errexit +set -o nounset +set -o pipefail + function check_for_ppa(){ local repo="$1" diff --git a/cluster/juju/util.sh b/cluster/juju/util.sh index 50cc0309f8..12587edc35 100755 --- a/cluster/juju/util.sh +++ b/cluster/juju/util.sh @@ -1,8 +1,6 @@ #!/bin/bash -set -euo pipefail - -# Copyright 2014 Canonical LTD. All rights reserved. +# Copyright 2015 Google Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,9 +14,10 @@ set -euo pipefail # See the License for the specific language governing permissions and # limitations under the License. -# If you find any bugs within this script - please file bugs against the -# Kubernetes Juju Charms project - located here: https://github.com/whitmo/bundle-kubernetes +set -o errexit +set -o nounset +set -o pipefail source $KUBE_ROOT/cluster/juju/prereqs/ubuntu-juju.sh KUBE_BUNDLE_URL='https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.yaml'