Merge pull request #12751 from stevekuznetsov/skuznets/path-updates

OpenShift Bot · web-flow · commit e2e5d9e82262 · 2017-02-03T09:42:06.000-05:00
Merged by openshift-bot
diff --git a/hack/lib/util/environment.sh b/hack/lib/util/environment.sh
@@ -106,7 +106,7 @@ readonly -f os::util::environment::setup_all_server_vars
 # Returns:
 #  - export PATH
 function os::util::environment::update_path_var() {
-    PATH="${OS_OUTPUT_BINPATH}/$(os::util::host_platform):${PATH}"
+    PATH="${OS_OUTPUT_BINPATH}/$(os::util::host_platform):${GOPATH}/bin:${PATH}"
     export PATH
 }
 readonly -f os::util::environment::update_path_var
diff --git a/hack/update-generated-protobuf.sh b/hack/update-generated-protobuf.sh
@@ -13,7 +13,7 @@ if ! os::util::find::system_binary 'protoc' || [[ "$(protoc --version)" != "libp
   exit 1
 fi
 
-os::util::ensure::system_binary_exists 'goimports'
+os::util::ensure::gopath_binary_exists 'goimports'
 os::build::setup_env
 
 os::util::ensure::built_binary_exists 'genprotobuf'

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ readonly -f os::util::environment::setup_all_server_vars`
`106`	`106`	`# Returns:`
`107`	`107`	`# - export PATH`
`108`	`108`	`function os::util::environment::update_path_var() {`
`109`		`- PATH="${OS_OUTPUT_BINPATH}/$(os::util::host_platform):${PATH}"`
	`109`	`+ PATH="${OS_OUTPUT_BINPATH}/$(os::util::host_platform):${GOPATH}/bin:${PATH}"`
`110`	`110`	`export PATH`
`111`	`111`	`}`
`112`	`112`	`readonly -f os::util::environment::update_path_var`