@@ -1,19 +1,5 @@

 #!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-# Set a useful format for xtrace output

-# export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'

-

-OS_ROOT=$(

-  unset CDPATH

-  origin_root=$(dirname "${BASH_SOURCE}")/../..

-  cd "${origin_root}"

-  pwd

-)

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"

 source ${OS_ROOT}/contrib/vagrant/provision-util.sh

 # Passed as arguments to provisioning script

@@ -4,18 +4,8 @@

 #

 # Set OS_IMAGE_PUSH=true to push images to a registry

 #

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 oc="$(os::build::find-binary oc ${OS_ROOT})"

 if [[ -z "${oc}" ]]; then

@@ -1,15 +1,8 @@

 #!/bin/bash

 # Build all cross compile targets and the base binaries

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 platforms=( "${OS_CROSS_COMPILE_PLATFORMS[@]}" )

 if [[ -n "${OS_ONLY_BUILD_PLATFORMS-}" ]]; then

@@ -1,15 +1,8 @@

 #!/bin/bash

 # This script sets up a go workspace locally and builds all go components.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 # only works on Linux for now, all other platforms must build binaries themselves

 if [[ -z "$@" ]]; then

@@ -6,19 +6,9 @@

 # NOTE:  you only need to run this script if your code changes are part of

 # any images OpenShift runs internally such as origin-sti-builder, origin-docker-builder,

 # origin-deployer, etc.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 source "${OS_ROOT}/contrib/node/install-sdn.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

 if [[ "${OS_RELEASE:-}" == "n" ]]; then

   # Use local binaries

@@ -2,20 +2,14 @@

 # This script build the sources in openshift/origin-release image using

 # the Fedora environment and Go compiler.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-function absolute_path() { 

+function absolute_path() {

   pushd . > /dev/null

   [ -d "$1" ] && cd "$1" && dirs -l +0

   popd > /dev/null

 }

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 origin_path="src/github.com/openshift/origin"

 # TODO: Remove this check and fix the docker command instead after the

@@ -4,18 +4,8 @@

 # image to be built prior to executing this command via hack/build-base-images.sh.

 # NOTE:   only committed code is built.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 context="${OS_ROOT}/_output/buildenv-context"

@@ -1,17 +1,7 @@

 #!/bin/bash

 # See HACKING.md for usage

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 repo="${UPSTREAM_REPO:-k8s.io/kubernetes}"

 package="${UPSTREAM_PACKAGE:-pkg/api}"

@@ -3,24 +3,6 @@

 # This script provides common script functions for the hacks

 # Requires OS_ROOT to be set

-set -o errexit

-set -o nounset

-set -o pipefail

-

-# The root of the build/dist directory

-readonly OS_ROOT=$(

-  unset CDPATH

-  os_root=$(dirname "${BASH_SOURCE}")/..

-

-  cd "${os_root}"

-  os_root=`pwd`

-  if [ -h "${os_root}" ]; then

-    readlink "${os_root}"

-  else

-    pwd

-  fi

-)

-

 readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.6}"

 readonly OS_BUILD_ENV_IMAGE="${OS_BUILD_ENV_IMAGE:-openshift/origin-release:golang-${OS_BUILD_ENV_GOLANG}}"

@@ -1,16 +1,9 @@

 #!/usr/bin/env bash

-set -o errexit

-set -o nounset

-set -o pipefail

 # this will allow matching files also in subdirs with **/*.json pattern

 shopt -s globstar

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 GODEP_ROOT="${OS_ROOT}/vendor"

 KUBE_ROOT=${1:-""}

@@ -4,16 +4,6 @@

 # image to be built prior to executing this command via hack/build-base-images.sh.

 # NOTE:   only committed code is built.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::environment::run "$@"

\ No newline at end of file

@@ -5,15 +5,7 @@

 #

 #   $ source hack/export-certs.sh ./openshift.local.config/master/admin

 #   $ curl $CURL_ARGS <a protected URL>

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-set -e

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 DEF="${1:-}"

 CERT_DIR="${CERT_DIR:-$DEF}"

@@ -2,16 +2,7 @@

 # This script extracts a valid release tar into _output/releases. It requires hack/build-release.sh

 # to have been executed

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 # Copy the release archives release back to the local _output/local/bin/... directories.

 # NOTE: On Mac and Windows you must pass WARN=1 in order to extract the output.

@@ -13,10 +13,7 @@

 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 # See the License for the specific language governing permissions and

 # limitations under the License.

-

-set -o errexit

-set -o nounset

-set -o pipefail

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 #### HACK ####

 # Sometimes godep just can't handle things. This lets use manually put

@@ -59,8 +56,6 @@ pin-godep() {

   popd > /dev/null

 }

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-

 # build the godep tool

 # Again go get stinks, hence || true

 go get -u github.com/tools/godep 2>/dev/null || true

@@ -13,10 +13,7 @@

 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 # See the License for the specific language governing permissions and

 # limitations under the License.

-

-set -o errexit

-set -o nounset

-set -o pipefail

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 pin-godep() {

   pushd "${GOPATH}/src/github.com/tools/godep" > /dev/null

@@ -25,8 +22,6 @@ pin-godep() {

   popd > /dev/null

 }

-ORIGIN_ROOT=$(dirname "${BASH_SOURCE}")/..

-

 # build the godep tool

 # Again go get stinks, hence || true

 go get -u github.com/tools/godep 2>/dev/null || true

@@ -43,6 +38,4 @@ REQUIRED_BINS=(

   "./..."

 )

-pushd "${ORIGIN_ROOT}" > /dev/null

 "${GODEP}" save -t "${REQUIRED_BINS[@]}"

-popd > /dev/null

@@ -1,14 +1,5 @@

 #!/bin/bash

-

-set -e

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 etcd_version=$(go run ${OS_ROOT}/tools/godepversion/godepversion.go ${OS_ROOT}/Godeps/Godeps.json github.com/coreos/etcd/etcdserver)

@@ -1,10 +1,6 @@

 #!/bin/bash

-

-set -e

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 GO_VERSION=($(go version))

 echo "Detected go version: $(go version)"

@@ -5,10 +5,33 @@

 # sively `source`s *.sh files in this directory tree. As such, no files should be `source`ed outside

 # of this script to ensure that we do not attempt to overwrite read-only variables.

-if [[ -z "${OS_ROOT:-}" ]]; then

-	echo "[ERROR] In order to import OpenShift Bash libraries, \$OS_ROOT must be set."

-	exit 1

-fi

+set -o errexit

+set -o nounset

+set -o pipefail

+

+# os::util::absolute_path returns the absolute path to the directory provided

+function os::util::absolute_path() {

+	local relative_path="$1"

+	local absolute_path

+

+	pushd "${relative_path}" >/dev/null

+	relative_path="$( pwd )"

+	if [[ -h "${relative_path}" ]]; then

+		absolute_path="$( readlink "${relative_path}" )"

+	else

+		absolute_path="${relative_path}"

+	fi

+	popd >/dev/null

+

+	echo "${absolute_path}"

+}

+readonly -f os::util::absolute_path

+

+# find the absolute path to the root of the Origin source tree

+init_source="$( dirname "${BASH_SOURCE}" )/../.."

+OS_ROOT="$( os::util::absolute_path "${init_source}" )"

+export OS_ROOT

+cd "${OS_ROOT}"

 library_files=( $( find "${OS_ROOT}/hack/lib" -type f -name '*.sh' -not -path '*/hack/lib/init.sh' ) )

 # TODO(skuzmets): Move the contents of the following files into respective library files.

@@ -19,4 +42,8 @@ for library_file in "${library_files[@]}"; do

 	source "${library_file}"

 done

-unset library_files library_file

\ No newline at end of file

+unset library_files library_file init_source

+

+# all of our Bash scripts need to have the stacktrace

+# handler installed to deal with errors

+os::log::stacktrace::install

\ No newline at end of file

@@ -121,8 +121,9 @@ function os::util::find-go-binary() {

   IFS=":"

   for part in $GOPATH; do

-    if [[ -f "$part/bin/$binary_name" && -x "${part}/bin/${binary_name}" ]]; then

-      echo $part/bin/$binary_name

+  	local binary="${part}/bin/${binary_name}"

+    if [[ -f "${binary}" && -x "${binary}" ]]; then

+      echo "${binary}"

       break

     fi

   done

@@ -1,14 +1,5 @@

 #!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

@@ -6,17 +6,7 @@

 #  2. Set TARGET_BRANCH for the new branch to work in

 #  3. In your kube git directory, set the current branch to the level to want to apply patches to

 #  4. Run `hack/move-upstream.sh master...<commit hash you want to start pulling patches from>`

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 repo="${UPSTREAM_REPO:-k8s.io/kubernetes}"

 package="${UPSTREAM_PACKAGE:-pkg/api}"

@@ -5,17 +5,8 @@

 # Set OS_PUSH_BASE_IMAGES=true to push base images

 # Set OS_PUSH_BASE_REGISTRY to prefix the destination images

 #

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 # Allow a release to be repushed with a tag

 tag="${OS_PUSH_TAG:-}"

@@ -5,13 +5,7 @@

 # Prereq:

 # go get github.com/fzipp/pythia

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 # Check for `go` binary and set ${GOPATH}.

 os::build::setup_env

@@ -1,11 +1,5 @@

 #!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 "${OS_ROOT}/hack/build-go.sh" tools/rebasehelpers/godepchecker

@@ -1,16 +1,7 @@

 #!/bin/bash

 # This script builds and pushes a release to DockerHub.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 tag="${OS_TAG:-}"

 if [[ -z "${tag}" ]]; then

@@ -1,16 +1,7 @@

 #!/bin/bash

 # This script builds and pushes a release to DockerHub.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 tag="${OS_TAG:-}"

 if [[ -z "${tag}" ]]; then

@@ -2,16 +2,8 @@

 # This command checks that the built commands can function together for

 # simple scenarios.  It does not require Docker so it can run in travis.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-cd "${OS_ROOT}"

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::util::environment::setup_time_vars

 function cleanup()

@@ -2,14 +2,8 @@

 # This script tests the high level end-to-end functionality demonstrated

 # as part of the examples/sample-app

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 echo "[INFO] Starting containerized end-to-end test"

@@ -33,7 +27,7 @@ function cleanup()

 	set +e

 	dump_container_logs

-	# pull information out of the server log so that we can get failure management in jenkins to highlight it and 

+	# pull information out of the server log so that we can get failure management in jenkins to highlight it and

 	# really have it smack people in their logs.  This is a severe correctness problem

     grep -a5 "CACHE.*ALTERED" ${LOG_DIR}/container-origin.log

@@ -2,13 +2,8 @@

 # This script tests the high level end-to-end functionality demonstrated

 # as part of the examples/sample-app

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 readonly JQSETPULLPOLICY='(.items[] | select(.kind == "DeploymentConfig") | .spec.template.spec.containers[0].imagePullPolicy) |= "IfNotPresent"'

@@ -21,9 +16,6 @@ if [[ "${TEST_END_TO_END:-}" != "direct" ]]; then

 	echo "++ Docker is not installed, running end-to-end against local binaries"

 fi

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

 ensure_iptables_or_die

 echo "[INFO] Starting end-to-end test"

@@ -19,11 +19,6 @@

 #  - JUNIT_REPORT:        toggles the creation of jUnit XML from the test output and changes this script's output behavior

 #                         to use the 'junitreport' tool for summarizing the tests.

 #  - DLV_DEBUG            toggles running tests using delve debugger

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 function exit_trap() {

     local return_code=$?

@@ -42,10 +37,7 @@ function exit_trap() {

 trap exit_trap EXIT

 start_time=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-cd "${OS_ROOT}"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

 os::util::environment::setup_tmpdir_vars "test-go"

@@ -1,16 +1,6 @@

 #!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

@@ -21,17 +21,7 @@

 #

 # KUBE_ROOT=../kubernetes hack/test-kube-e2e.sh --ginkgo.focus="Network.*intra"

 #

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(

-  unset CDPATH

-  origin_root=$(dirname "${BASH_SOURCE}")/..

-  cd "${origin_root}"

-  pwd

-)

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 KUBE_ROOT=${KUBE_ROOT:-""}

@@ -1,16 +1,11 @@

 #!/bin/bash

 # This script runs all of the test written for our Bash libraries.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 function exit_trap() {

     local return_code=$?

     end_time=$(date +%s)

-    

+

     if [[ "${return_code}" -eq "0" ]]; then

         verb="succeeded"

     else

@@ -24,9 +19,7 @@ function exit_trap() {

 trap exit_trap EXIT

 start_time=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::util::environment::setup_tmpdir_vars "test-lib"

 cd "${OS_ROOT}"

@@ -2,15 +2,11 @@

 #

 # This script tests os::test::junit functionality.

-set -o errexit

-set -o nounset

-set -o pipefail

-

 function exit_trap() {

     local return_code=$?

     end_time=$(date +%s)

-    

+

     if [[ "${return_code}" -eq "0" ]]; then

         verb="succeeded"

     else

@@ -24,9 +20,7 @@ function exit_trap() {

 trap exit_trap EXIT

 start_time=$(date +%s)

-OS_ROOT="$( dirname "${BASH_SOURCE}" )"/../../..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$( dirname "${BASH_SOURCE}" )/../../lib/init.sh"

 # envars used to track these interactions are not propagated out of the subshells used to run these commands

 # therefore each os::cmd call is its own sandbox and complicated scenarios need to play out inside one call

@@ -1,14 +1,5 @@

 #!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

@@ -1,16 +1,8 @@

 #!/bin/bash

 # This command runs any exposed integration tests for the developer tools

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

 STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-cd "${OS_ROOT}"

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::test::junit::declare_suite_start 'tools'

@@ -1,14 +1,6 @@

 #!/bin/bash

 # This file ensures that the helper functions in util.sh behave as expected

-

-set -o errexit

-set -o nounset

-set -o pipefail

-# set -x

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 trap os::test::junit::reconcile_output EXIT

 BASETMPDIR="${TMPDIR:-/tmp}/openshift/test-tools"

@@ -166,7 +158,7 @@ os::cmd::expect_success_and_text 'echo $(( 1 - 20 ))' '\-19' # we need to escape

 # redirects

 os::cmd::expect_failure_and_text 'grep' '(Usage|usage)'

-os::cmd::expect_success_and_not_text 'pwd 1>/dev/null' '.' 

+os::cmd::expect_success_and_not_text 'pwd 1>/dev/null' '.'

 os::cmd::expect_failure_and_not_text 'grep 2>/dev/null' '(Usage|usage)'

@@ -186,161 +178,161 @@ os::test::junit::declare_suite_start "cmd/util/output"

 # expect_code

 output=$(os::cmd::expect_code 'exit 0' '0')

-echo "${output}" | grep -q 'SUCCESS' 

+echo "${output}" | grep -q 'SUCCESS'

 output=$(os::cmd::expect_code 'exit 1' '0') || true

-echo "${output}" | grep -q 'FAILURE' 

-echo "${output}" | grep -q 'the command returned the wrong error code' 

+echo "${output}" | grep -q 'FAILURE'

+echo "${output}" | grep -q 'the command returned the wrong error code'

 output=$(os::cmd::expect_code 'exit 1' '1')

-echo "${output}" | grep -q 'SUCCESS' 

+echo "${output}" | grep -q 'SUCCESS'

 output=$(os::cmd::expect_code 'exit 0' '1') || true

-echo "${output}" | grep -q 'FAILURE' 

-echo "${output}" | grep -q 'the command returned the wrong error code' 

+echo "${output}" | grep -q 'FAILURE'

+echo "${output}" | grep -q 'the command returned the wrong error code'

 output=$(os::cmd::expect_code 'exit 99' '99')

-echo "${output}" | grep -q 'SUCCESS' 

+echo "${output}" | grep -q 'SUCCESS'

 output=$(os::cmd::expect_code 'exit 1' '99') || true

-echo "${output}" | grep -q 'FAILURE' 

-echo "${output}" | grep -q 'the command returned the wrong error code' 

+echo "${output}" | grep -q 'FAILURE'

+echo "${output}" | grep -q 'the command returned the wrong error code'

 # expect_success

 output=$(os::cmd::expect_success 'exit 0')

-echo "${output}" | grep -q 'SUCCESS' 

+echo "${output}" | grep -q 'SUCCESS'

 output=$(os::cmd::expect_success 'exit 1') || true

-echo "${output}" | grep -q 'FAILURE' 

-echo "${output}" | grep -q 'the command returned the wrong error code' 

+echo "${output}" | grep -q 'FAILURE'

+echo "${output}" | grep -q 'the command returned the wrong error code'

 # expect_failure

 output=$(os::cmd::expect_failure 'exit 1')