@@ -7,14 +7,14 @@ set -o pipefail

 # Set a useful format for xtrace output

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

-OS_ROOT=$(

+ORIGIN_ROOT=$(

   unset CDPATH

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

   cd "${origin_root}"

   pwd

 )

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

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

+source ${ORIGIN_ROOT}/hack/common.sh

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

 # Passed as arguments to provisioning script

 MASTER_IP=${1:-""}

@@ -26,7 +26,7 @@ INSTANCE_PREFIX=${4:-${OPENSHIFT_INSTANCE_PREFIX:-openshift}}

 FIXUP_NET_UDEV=false

 NETWORK_PLUGIN=${OPENSHIFT_NETWORK_PLUGIN:-""}

 NODE_INDEX=0

-CONFIG_ROOT=${OS_ROOT}

+CONFIG_ROOT=${ORIGIN_ROOT}

 SKIP_BUILD=${OPENSHIFT_SKIP_BUILD:-false}

 # Parse optional arguments

@@ -6,7 +6,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

 pushd "${OS_ROOT}/assets" > /dev/null

@@ -11,7 +11,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

 # Go to the top of the tree.

@@ -8,7 +8,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

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

@@ -8,7 +8,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

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

@@ -13,7 +13,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

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

 os::log::install_errexit

@@ -15,7 +15,7 @@ function absolute_path() {

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/text.sh"

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

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

@@ -11,7 +11,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

 # Go to the top of the tree.

@@ -7,7 +7,8 @@ set -o nounset

 set -o pipefail

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

 # Go to the top of the tree.

@@ -3,7 +3,7 @@

 set -e

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

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

+source "${OS_ROOT}/hack/common.sh"

 pushd ${OS_ROOT}/assets > /dev/null

   echo "Cleaning up bower_components, node_modules, and dist directories..."

@@ -2,6 +2,11 @@

 # This utility file contains functions that wrap commands to be tested. All wrapper functions run commands

 # in a sub-shell and redirect all output. Tests in test-cmd *must* use these functions for testing.

+# We assume ${OS_ROOT} is set

+source "${OS_ROOT}/hack/text.sh"

+source "${OS_ROOT}/hack/util.sh"

+source "${OS_ROOT}/hack/lib/test/junit.sh"

+

 # expect_success runs the cmd and expects an exit code of 0

 function os::cmd::expect_success() {

 	if [[ $# -ne 1 ]]; then echo "os::cmd::expect_success expects only one argument, got $#"; exit 1; fi

@@ -9,7 +14,6 @@ function os::cmd::expect_success() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}"

 }

-readonly -f os::cmd::expect_success

 # expect_failure runs the cmd and expects a non-zero exit code

 function os::cmd::expect_failure() {

@@ -18,7 +22,6 @@ function os::cmd::expect_failure() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::failure_func"

 }

-readonly -f os::cmd::expect_failure

 # expect_success_and_text runs the cmd and expects an exit code of 0

 # as well as running a grep test to find the given string in the output

@@ -29,7 +32,6 @@ function os::cmd::expect_success_and_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::success_func" "${expected_text}"

 }

-readonly -f os::cmd::expect_success_and_text

 # expect_failure_and_text runs the cmd and expects a non-zero exit code

 # as well as running a grep test to find the given string in the output

@@ -40,7 +42,6 @@ function os::cmd::expect_failure_and_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::failure_func" "${expected_text}"

 }

-readonly -f os::cmd::expect_failure_and_text

 # expect_success_and_not_text runs the cmd and expects an exit code of 0

 # as well as running a grep test to ensure the given string is not in the output

@@ -51,7 +52,6 @@ function os::cmd::expect_success_and_not_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::success_func" "${expected_text}" "os::cmd::internal::failure_func"

 }

-readonly -f os::cmd::expect_success_and_not_text

 # expect_failure_and_not_text runs the cmd and expects a non-zero exit code

 # as well as running a grep test to ensure the given string is not in the output

@@ -62,7 +62,6 @@ function os::cmd::expect_failure_and_not_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::failure_func" "${expected_text}" "os::cmd::internal::failure_func"

 }

-readonly -f os::cmd::expect_failure_and_not_text

 # expect_code runs the cmd and expects a given exit code

 function os::cmd::expect_code() {

@@ -72,7 +71,6 @@ function os::cmd::expect_code() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::specific_code_func ${expected_cmd_code}"

 }

-readonly -f os::cmd::expect_code

 # expect_code_and_text runs the cmd and expects the given exit code

 # as well as running a grep test to find the given string in the output

@@ -84,7 +82,6 @@ function os::cmd::expect_code_and_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::specific_code_func ${expected_cmd_code}" "${expected_text}"

 }

-readonly -f os::cmd::expect_code_and_text

 # expect_code_and_not_text runs the cmd and expects the given exit code

 # as well as running a grep test to ensure the given string is not in the output

@@ -96,7 +93,6 @@ function os::cmd::expect_code_and_not_text() {

 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::specific_code_func ${expected_cmd_code}" "${expected_text}" "os::cmd::internal::failure_func"

 }

-readonly -f os::cmd::expect_code_and_not_text

 millisecond=1

 second=$(( 1000 * millisecond ))

@@ -113,7 +109,6 @@ function os::cmd::try_until_success() {

 	os::cmd::internal::run_until_exit_code "${cmd}" "os::cmd::internal::success_func" "${duration}" "${interval}"

 }

-readonly -f os::cmd::try_until_success

 # os::cmd::try_until_failure runs the cmd until either the command fails or times out

 # the default time-out for os::cmd::try_until_failure is 60 seconds.

@@ -125,7 +120,6 @@ function os::cmd::try_until_failure() {

 	os::cmd::internal::run_until_exit_code "${cmd}" "os::cmd::internal::failure_func" "${duration}" "${interval}"

 }

-readonly -f os::cmd::try_until_failure

 # os::cmd::try_until_text runs the cmd until either the command outputs the desired text or times out

 # the default time-out for os::cmd::try_until_text is 60 seconds.

@@ -138,7 +132,6 @@ function os::cmd::try_until_text() {

 	os::cmd::internal::run_until_text "${cmd}" "${text}" "${duration}" "${interval}"

 }

-readonly -f os::cmd::try_until_text

 # Functions in the os::cmd::internal namespace are discouraged from being used outside of os::cmd

@@ -230,15 +223,14 @@ function os::cmd::internal::expect_exit_code_run_grep() {

 	( IFS=$'\n'; echo "${junit_log[*]}" >> "${JUNIT_REPORT_OUTPUT:-/dev/null}" )

 	os::test::junit::declare_test_end

 	return "${return_code}"

+

 }

-readonly -f os::cmd::internal::expect_exit_code_run_grep

 # os::cmd::internal::init_tempdir initializes the temporary directory

 function os::cmd::internal::init_tempdir() {

 	mkdir -p "${os_cmd_internal_tmpdir}"

 	rm -f "${os_cmd_internal_tmpdir}"/tmp_std{out,err}.log

 }

-readonly -f os::cmd::internal::init_tempdir

 # os::cmd::internal::describe_call determines the file:line of the latest function call made

 # from outside of this file in the call stack, and the name of the function being called from

@@ -268,7 +260,6 @@ function os::cmd::internal::describe_call() {

 	echo "${full_name}"

 }

-readonly -f os::cmd::internal::describe_call

 # os::cmd::internal::determine_caller determines the file relative to the OpenShift Origin root directory

 # and line number of the function call to the outer os::cmd wrapper function

@@ -293,7 +284,6 @@ function os::cmd::internal::determine_caller() {

 	local caller_line="${BASH_LINENO[${call_depth}-1]}"

 	echo "${caller_file}:${caller_line}"

 }

-readonly -f os::cmd::internal::determine_caller

 # os::cmd::internal::describe_expectation describes a command return code evaluation function

 function os::cmd::internal::describe_expectation() {

@@ -310,7 +300,6 @@ function os::cmd::internal::describe_expectation() {

 		echo "any result"

 	esac

 }

-readonly -f os::cmd::internal::describe_expectation

 # os::cmd::internal::seconds_since_epoch returns the number of seconds elapsed since the epoch

 # with milli-second precision

@@ -323,7 +312,6 @@ function os::cmd::internal::seconds_since_epoch() {

 	fi

 	echo $(bc <<< "scale=3; ${ns}/1000000000")

 }

-readonly -f os::cmd::internal::seconds_since_epoch

 # os::cmd::internal::run_collecting_output runs the command given, piping stdout and stderr into

 # the given files, and returning the exit code of the command

@@ -336,7 +324,6 @@ function os::cmd::internal::run_collecting_output() {

 	return "${result}"

 }

-readonly -f os::cmd::internal::run_collecting_output

 # os::cmd::internal::success_func determines if the input exit code denotes success

 # this function returns 0 for false and 1 for true to be compatible with arithmetic tests

@@ -347,7 +334,6 @@ function os::cmd::internal::success_func() {

 	[[ "${exit_code}" -ne "0" ]]

 	return $?

 }

-readonly -f os::cmd::internal::success_func

 # os::cmd::internal::failure_func determines if the input exit code denotes failure

 # this function returns 0 for false and 1 for true to be compatible with arithmetic tests

@@ -358,7 +344,6 @@ function os::cmd::internal::failure_func() {

 	[[ "${exit_code}" -eq "0" ]]

 	return $?

 }

-readonly -f os::cmd::internal::failure_func

 # os::cmd::internal::specific_code_func determines if the input exit code matches the given code

 # this function returns 0 for false and 1 for true to be compatible with arithmetic tests

@@ -370,13 +355,11 @@ function os::cmd::internal::specific_code_func() {

 	[[ "${exit_code}" -ne "${expected_code}" ]]

 	return $?

 }

-readonly -f os::cmd::internal::specific_code_func

 # os::cmd::internal::get_results prints the stderr and stdout files

 function os::cmd::internal::get_results() {

 	cat "${os_cmd_internal_tmpout}" "${os_cmd_internal_tmperr}"

 }

-readonly -f os::cmd::internal::get_results

 # os::cmd::internal::get_try_until_results returns a concise view of the stdout and stderr output files

 # using a timeline format, where consecutive output lines that are the same are condensed into one line

@@ -396,14 +379,12 @@ function os::cmd::internal::print_try_until_results() {

 		echo "There was no error output from the command."

 	fi

 }

-readonly -f os::cmd::internal::print_try_until_results

 # os::cmd::internal::mark_attempt marks the end of an attempt in the stdout and stderr log files

 # this is used to make the try_until_* output more concise

 function os::cmd::internal::mark_attempt() {

 	echo -e '\x1e' >> "${os_cmd_internal_tmpout}" | tee "${os_cmd_internal_tmperr}"

 }

-readonly -f os::cmd::internal::mark_attempt

 # os::cmd::internal::compress_output compresses an output file into timeline representation

 function os::cmd::internal::compress_output() {

@@ -411,7 +392,6 @@ function os::cmd::internal::compress_output() {

 	awk -f ${OS_ROOT}/hack/compress.awk $logfile

 }

-readonly -f os::cmd::internal::compress_output

 # os::cmd::internal::print_results pretty-prints the stderr and stdout files

 function os::cmd::internal::print_results() {

@@ -429,7 +409,6 @@ function os::cmd::internal::print_results() {

 		echo "There was no error output from the command."

 	fi

 }

-readonly -f os::cmd::internal::print_results

 # os::cmd::internal::assemble_causes determines from the two input booleans which part of the test

 # failed and generates a nice delimited list of failure causes

@@ -448,7 +427,7 @@ function os::cmd::internal::assemble_causes() {

 	local list=$(printf '; %s' "${causes[@]}")

 	echo "${list:2}"

 }

-readonly -f os::cmd::internal::assemble_causes

+

 # os::cmd::internal::run_until_exit_code runs the provided command until the exit code test given

 # succeeds or the timeout given runs out. Output from the command to be tested is suppressed unless

@@ -530,7 +509,6 @@ function os::cmd::internal::run_until_exit_code() {

 	os::test::junit::declare_test_end

 	return "${return_code}"

 }

-readonly -f os::cmd::internal::run_until_exit_code

 # os::cmd::internal::run_until_text runs the provided command until the command output contains the

 # given text or the timeout given runs out. Output from the command to be tested is suppressed unless

@@ -615,4 +593,3 @@ function os::cmd::internal::run_until_text() {

 	os::test::junit::declare_test_end

 	return "${return_code}"

 }

-readonly -f os::cmd::internal::run_until_text

\ No newline at end of file

@@ -120,23 +120,21 @@ readonly OS_BINARY_RELEASE_CLIENT_EXTRA=(

 # os::build::binaries_from_targets take a list of build targets and return the

 # full go package to be built

-function os::build::binaries_from_targets() {

+os::build::binaries_from_targets() {

   local target

   for target; do

     echo "${OS_GO_PACKAGE}/${target}"

   done

 }

-readonly -f os::build::binaries_from_targets

 # Asks golang what it thinks the host platform is.  The go tool chain does some

 # slightly different things when the target platform matches the host platform.

-function os::build::host_platform() {

+os::build::host_platform() {

   echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"

 }

-readonly -f os::build::host_platform

 # Create a user friendly version of host_platform for end users

-function os::build::host_platform_friendly() {

+os::build::host_platform_friendly() {

   local platform=${1:-}

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

     platform=$(os::build::host_platform)

@@ -153,7 +151,6 @@ function os::build::host_platform_friendly() {

     echo "$(go env GOHOSTOS)-$(go env GOHOSTARCH)"

   fi

 }

-readonly -f os::build::host_platform_friendly

 # os::build::setup_env will check that the `go` commands is available in

 # ${PATH}. If not running on Travis, it will also check that the Go version is

@@ -164,7 +161,7 @@ readonly -f os::build::host_platform_friendly

 #     stuff.

 #   export GOBIN - This is actively unset if already set as we want binaries

 #     placed in a predictable place.

-function os::build::setup_env() {

+os::build::setup_env() {

   if [[ -z "$(which go)" ]]; then

     cat <<EOF

@@ -234,7 +231,6 @@ EOF

   export GOPATH

   export OS_TARGET_BIN

 }

-readonly -f os::build::setup_env

 # Build static binary targets.

 #

@@ -243,10 +239,9 @@ readonly -f os::build::setup_env

 #     are built.

 #   OS_BUILD_PLATFORMS - Incoming variable of targets to build for.  If unset

 #     then just the host architecture is built.

-function os::build::build_static_binaries() {

+os::build::build_static_binaries() {

   CGO_ENABLED=0 os::build::build_binaries -a -installsuffix=cgo $@

 }

-readonly -f os::build::build_static_binaries

 # Build binaries targets specified

 #

@@ -255,7 +250,7 @@ readonly -f os::build::build_static_binaries

 #     are built.

 #   OS_BUILD_PLATFORMS - Incoming variable of targets to build for.  If unset

 #     then just the host architecture is built.

-function os::build::build_binaries() {

+os::build::build_binaries() {

   # Create a sub-shell so that we don't pollute the outer environment

   (

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

@@ -326,12 +321,11 @@ function os::build::build_binaries() {

     done

   )

 }

-readonly -f os::build::build_binaries

 # Generates the set of target packages, binaries, and platforms to build for.

 # Accepts binaries via $@, and platforms via OS_BUILD_PLATFORMS, or defaults to

 # the current platform.

-function os::build::export_targets() {

+os::build::export_targets() {

   targets=()

   local arg

   for arg; do

@@ -351,7 +345,6 @@ function os::build::export_targets() {

     platforms=("$(os::build::host_platform)")

   fi

 }

-readonly -f os::build::export_targets

 # This will take $@ from $GOPATH/bin and copy them to the appropriate

 # place in ${OS_OUTPUT_BINDIR}

@@ -364,7 +357,7 @@ readonly -f os::build::export_targets

 # install' will place binaries that match the host platform directly in $GOBIN

 # while placing cross compiled binaries into `platform_arch` subdirs.  This

 # complicates pretty much everything else we do around packaging and such.

-function os::build::place_bins() {

+os::build::place_bins() {

   (

     local host_platform

     host_platform=$(os::build::host_platform)

@@ -456,9 +449,8 @@ function os::build::place_bins() {

     done

   )

 }

-readonly -f os::build::place_bins

-function os::build::archive_zip() {

+os::build::archive_zip() {

   local platform_segment="${platform//\//-}"

   local default_name="${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-${platform_segment}.zip"

   local archive_name="${archive_name:-$default_name}"

@@ -470,9 +462,8 @@ function os::build::archive_zip() {

     zip "${OS_LOCAL_RELEASEPATH}/${archive_name}" -qj "${release_binpath}/${file}"

   done

 }

-readonly -f os::build::archive_zip

-function os::build::archive_tar() {

+os::build::archive_tar() {

   local platform_segment="${platform//\//-}"

   local base_name="${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-${platform_segment}"

   local default_name="${base_name}.tar.gz"

@@ -487,7 +478,6 @@ function os::build::archive_tar() {

   fi

   popd &>/dev/null

 }

-readonly -f os::build::archive_tar

 # Checks if the filesystem on a partition that the provided path points to is

 # supporting hard links.

@@ -497,7 +487,7 @@ readonly -f os::build::archive_tar

 # Returns:

 #  0 - if hardlinks are supported

 #  non-zero - if hardlinks aren't supported

-function os::build::is_hardlink_supported() {

+os::build::is_hardlink_supported() {

   local path="$1"

   # Determine if FS supports hard links

   local temp_file=$(TMPDIR="${path}" mktemp)

@@ -505,7 +495,6 @@ function os::build::is_hardlink_supported() {

   rm -f "${temp_file}"

   return ${supported:-0}

 }

-readonly -f os::build::is_hardlink_supported

 # Extract a tar.gz compressed archive in a given directory. If the

 # archive contains hardlinks and the underlying filesystem is not

@@ -514,7 +503,7 @@ readonly -f os::build::is_hardlink_supported

 # Input:

 #   $1 - path to archive file

 #   $2 - directory where the archive will be extracted

-function os::build::extract_tar() {

+os::build::extract_tar() {

   local archive_file="$1"

   local change_dir="$2"

@@ -548,20 +537,18 @@ function os::build::extract_tar() {

     rm -rf "${temp_dir}"

   fi

 }

-readonly -f os::build::extract_tar

 # os::build::release_sha calculates a SHA256 checksum over the contents of the

 # built release directory.

-function os::build::release_sha() {

+os::build::release_sha() {

   pushd "${OS_LOCAL_RELEASEPATH}" &> /dev/null

   sha256sum * > CHECKSUM

   popd &> /dev/null

 }

-readonly -f os::build::release_sha

 # os::build::make_openshift_binary_symlinks makes symlinks for the openshift

 # binary in _output/local/bin/${platform}

-function os::build::make_openshift_binary_symlinks() {

+os::build::make_openshift_binary_symlinks() {

   platform=$(os::build::host_platform)

   if [[ -f "${OS_OUTPUT_BINPATH}/${platform}/openshift" ]]; then

     for linkname in "${OPENSHIFT_BINARY_SYMLINKS[@]}"; do

@@ -569,7 +556,6 @@ function os::build::make_openshift_binary_symlinks() {

     done

   fi

 }

-readonly -f os::build::make_openshift_binary_symlinks

 # os::build::detect_local_release_tars verifies there is only one primary and one

 # image binaries release tar in OS_LOCAL_RELEASEPATH for the given platform specified by

@@ -579,7 +565,7 @@ readonly -f os::build::make_openshift_binary_symlinks

 #

 #   OS_PRIMARY_RELEASE_TAR

 #   OS_IMAGE_RELEASE_TAR

-function os::build::detect_local_release_tars() {

+os::build::detect_local_release_tars() {

   local platform="$1"

   if [[ ! -d "${OS_LOCAL_RELEASEPATH}" ]]; then

@@ -613,11 +599,10 @@ function os::build::detect_local_release_tars() {

   export OS_CLIENT_RELEASE_TAR="${client}"

   export OS_RELEASE_COMMIT="$(cat ${OS_LOCAL_RELEASEPATH}/.commit)"

 }

-readonly -f os::build::detect_local_release_tars

 # os::build::get_version_vars loads the standard version variables as

 # ENV vars

-function os::build::get_version_vars() {

+os::build::get_version_vars() {

   if [[ -n ${OS_VERSION_FILE-} ]]; then

     source "${OS_VERSION_FILE}"

     return

@@ -625,10 +610,9 @@ function os::build::get_version_vars() {

   os::build::os_version_vars

   os::build::kube_version_vars

 }

-readonly -f os::build::get_version_vars

 # os::build::os_version_vars looks up the current Git vars

-function os::build::os_version_vars() {

+os::build::os_version_vars() {

   local git=(git --work-tree "${OS_ROOT}")

   if [[ -n ${OS_GIT_COMMIT-} ]] || OS_GIT_COMMIT=$("${git[@]}" rev-parse --short "HEAD^{commit}" 2>/dev/null); then

@@ -665,18 +649,16 @@ function os::build::os_version_vars() {

     fi

   fi

 }

-readonly -f os::build::os_version_vars

 # os::build::kube_version_vars returns the version of Kubernetes we have

 # vendored.

-function os::build::kube_version_vars() {

+os::build::kube_version_vars() {

   KUBE_GIT_VERSION=$(go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "k8s.io/kubernetes/pkg/api" "comment")

   KUBE_GIT_COMMIT=$(go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "k8s.io/kubernetes/pkg/api")

 }

-readonly -f os::build::kube_version_vars

 # Saves the environment flags to $1

-function os::build::save_version_vars() {

+os::build::save_version_vars() {

   local version_file=${1-}

   [[ -n ${version_file} ]] || {

     echo "!!! Internal error.  No file specified in os::build::save_version_vars"

@@ -693,10 +675,9 @@ KUBE_GIT_COMMIT='${KUBE_GIT_COMMIT-}'

 KUBE_GIT_VERSION='${KUBE_GIT_VERSION-}'

 EOF

 }

-readonly -f os::build::save_version_vars

 # golang 1.5 wants `-X key=val`, but golang 1.4- REQUIRES `-X key val`

-function os::build::ldflag() {

+os::build::ldflag() {

   local key=${1}

   local val=${2}

@@ -707,10 +688,9 @@ function os::build::ldflag() {

     echo "-X ${key}=${val}"

   fi

 }

-readonly -f os::build::ldflag

 # os::build::ldflags calculates the -ldflags argument for building OpenShift

-function os::build::ldflags() {

+os::build::ldflags() {

   # Run this in a subshell to prevent settings/variables from leaking.

   set -o errexit

   set -o nounset

@@ -732,23 +712,21 @@ function os::build::ldflags() {

   # The -ldflags parameter takes a single string, so join the output.

   echo "${ldflags[*]-}"

 }

-readonly -f os::build::ldflags

 # os::build::require_clean_tree exits if the current Git tree is not clean.

-function os::build::require_clean_tree() {

+os::build::require_clean_tree() {

   if ! git diff-index --quiet HEAD -- || test $(git ls-files --exclude-standard --others | wc -l) != 0; then

     echo "You can't have any staged or dirty files in $(pwd) for this command."

     echo "Either commit them or unstage them to continue."

     exit 1

   fi

 }

-readonly -f os::build::require_clean_tree

 # os::build::commit_range takes one or two arguments - if the first argument is an

 # integer, it is assumed to be a pull request and the local origin/pr/# branch is

 # used to determine the common range with the second argument. If the first argument

 # is not an integer, it is assumed to be a Git commit range and output directly.

-function os::build::commit_range() {

+os::build::commit_range() {

   local remote

   remote="${UPSTREAM_REMOTE:-origin}"

   if [[ "$1" =~ ^-?[0-9]+$ ]]; then

@@ -800,9 +778,8 @@ function os::build::commit_range() {

   echo "$1"

 }

-readonly -f os::build::commit_range

-function os::build::gen-docs() {

+os::build::gen-docs() {

   local cmd="$1"

   local dest="$2"

   local skipprefix="${3:-}"

@@ -838,9 +815,8 @@ function os::build::gen-docs() {

   echo "Assets generated in ${dest}"

 }

-readonly -f os::build::gen-docs

-function os::build::get-bin-output-path() {

+os::build::get-bin-output-path() {

   local os_root="${1:-}"

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

@@ -848,17 +824,15 @@ function os::build::get-bin-output-path() {

   fi

   echo ${os_root}_output/local/bin/$(os::build::host_platform)

 }

-readonly -f os::build::get-bin-output-path

 # os::build::find-binary locates a locally built binary for the current

 # platform and returns the path to the binary.  The base path to search

 # from will default to the current working directory but can be

 # overridden via the optional second argument.

-function os::build::find-binary() {

+os::build::find-binary() {

   local bin="$1"

   local os_root="${2:-}"

   local path=$( (ls -t $(os::build::get-bin-output-path "${os_root}")/${bin}) 2>/dev/null || true | head -1 )

   echo "$path"

 }

-readonly -f os::build::find-binary

\ No newline at end of file

@@ -7,7 +7,7 @@ set -o pipefail

 shopt -s globstar

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

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

+source "${OS_ROOT}/hack/common.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -11,7 +11,7 @@ set -o nounset

 set -o pipefail

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

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

+source "${OS_ROOT}/hack/util.sh"

 set -e

@@ -8,7 +8,7 @@ set -o nounset

 set -o pipefail

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

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

+source "${OS_ROOT}/hack/common.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -6,7 +6,8 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

 EXAMPLES=examples

@@ -8,7 +8,8 @@ set -o pipefail

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

 cd "${OS_ROOT}"

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

+source "${OS_ROOT}/hack/util.sh"

+source "${OS_ROOT}/hack/common.sh"

 os::log::install_errexit

 pushd "${OS_ROOT}/hack/swagger-doc" > /dev/null

@@ -6,7 +6,7 @@ OPENSHIFT_JVM_VERSION=v1.0.42

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

 TMPDIR="${TMPDIR:-"/tmp"}"

 LOG_DIR="${LOG_DIR:-$(mktemp -d ${TMPDIR}/openshift.assets.logs.XXXX)}"

@@ -7,7 +7,7 @@ set -o nounset

 set -o pipefail

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

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

+source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

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

@@ -4,7 +4,7 @@ set -e

 STARTTIME=$(date +%s)

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

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

+source "${OS_ROOT}/hack/common.sh"

 GO_VERSION=($(go version))

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

deleted file mode 100644

@@ -1,24 +0,0 @@

-#!/bin/bash

-

-# This script is meant to be the entrypoint for OpenShift Bash scripts to import all of the support

-# libraries at once in order to make Bash script preambles as minimal as possible. This script recur-

-# 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

-

-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.

-library_files+=( "${OS_ROOT}/hack/cmd_util.sh" )

-library_files+=( "${OS_ROOT}/hack/common.sh" )

-library_files+=( "${OS_ROOT}/hack/text.sh" )

-library_files+=( "${OS_ROOT}/hack/util.sh" )

-

-for library_file in "${library_files[@]}"; do

-	source "${library_file}"

-done

-

-unset library_files library_file

\ No newline at end of file

@@ -14,7 +14,6 @@

 function os::log::install_system_logger_cleanup() {

     trap "os::log::clean_up_logger; $(trap -p EXIT | awk -F"'" '{print $2}')" EXIT

 }

-readonly -f os::log::install_system_logger_cleanup

 # os::log::clean_up_logger should be trapped so that it can stop the logging utility once the script that

 # installed it is finished.

@@ -82,7 +81,6 @@ function os::log::clean_up_logger() {

     return "${return_code}"

 }

-readonly -f os::log::clean_up_logger

 # os::log::internal::prune_datafile removes the given columns from a datafile created by 'sadf -d'

 #

@@ -120,7 +118,6 @@ function os::log::internal::prune_datafile() {

     sed -i '1s/^/# /' "${datafile}.tmp"

     mv "${datafile}.tmp" "${datafile}"

 }

-readonly -f os::log::internal::prune_datafile

 # os::log::internal::plot uses gnuplot to make a plot of some data across time points. This function is intended to be used 

 # on the output of a 'sar -f' read of a sar binary file. Plots will be made of all columns and stacked on each other with one x axis.

@@ -186,7 +183,7 @@ function os::log::internal::plot() {

     echo "[INFO] Stacked plot for log subset \"${plotname}\" written to ${LOG_DIR}/${plotname}.pdf"

 }

-readonly -f os::log::internal::plot

+

 # os::log::start_system_logger installs the system logger and begins logging

 #

@@ -210,7 +207,7 @@ function os::log::start_system_logger() {

     os::log::install_system_logger_cleanup

 }

-readonly -f os::log::start_system_logger

+

 # os::log::internal::run_system_logger runs the system logger in the background.

 # 'sar' is configured to run once a second for 24 hours, so the cleanup trap should be installed to ensure that

@@ -232,5 +229,4 @@ function os::log::internal::run_system_logger() {

     LOGGER_PID=$!

     readonly LOGGER_PID