Skip to content

Commit

Permalink
Merge pull request kubernetes#28498 from endocode/kayrus/fix_kuberoot
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue

build: fixed ${KUBE_ROOT} prefix for build scripts

Running `./make-build-image.sh` command inside the `build` directory doesn't work:

```sh
$ cd build
$ ./make-build-image.sh 
./../build/common.sh: line 32: hack/lib/init.sh: No such file or directory
```

This PR adds `${KUBE_ROOT}` prefix for the `source` bash function. Also I added braces to unify the code style.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
  • Loading branch information
k8s-merge-robot authored Jul 7, 2016
2 parents 38ac367 + 745d253 commit e232ecd
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ readonly DOCKER_MACHINE_DRIVER=${DOCKER_MACHINE_DRIVER:-"virtualbox --virtualbox
# This will canonicalize the path
KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)

source hack/lib/init.sh
source "${KUBE_ROOT}/hack/lib/init.sh"

# Incoming options
#
Expand Down
2 changes: 1 addition & 1 deletion build/copy-output.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::copy_output
2 changes: 1 addition & 1 deletion build/make-build-image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::build_image
2 changes: 1 addition & 1 deletion build/make-clean.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::clean_output
Expand Down
2 changes: 1 addition & 1 deletion build/push-devel-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ KUBE_GCS_UPLOAD_RELEASE=y
KUBE_GCS_RELEASE_PREFIX="devel/${LATEST}"

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::release::gcs::release
2 changes: 1 addition & 1 deletion build/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}

Expand Down
2 changes: 1 addition & 1 deletion build/shell.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::build_image
Expand Down

0 comments on commit e232ecd

Please sign in to comment.