Merge in changes from main

Author: petetomasik

README.md

@@ -469,19 +469,19 @@ steps:
 
 Both field names are supported by Buildkite. The generated pipeline YAML will use `artifact_paths`.
 
-### `download_folder` (optional)
+### `binary_folder` (optional)
 
 Default: `BUILDKITE_PLUGINS_PATH`
 
-This is the filesystem folder where the Go binary will be download to.
+This is the filesystem folder where the Go binary will be kept.
 
 ## Example
 ```yaml
 steps:
   - label: "Triggering pipelines"
     plugins:
       - monorepo-diff#v1.8.0:
-          download_folder: "/var/buildkite-agent"
+          binary_folder: "/var/buildkite-agent"
           watch:
             - path: "bar-service/"
               config:

hooks/command

@@ -17,7 +17,7 @@ err() {
   exit 1
 }
 
-executable_dir="${BUILDKITE_PLUGIN_MONOREPO_DIFF_DOWNLOAD_FOLDER:-${BUILDKITE_PLUGINS_PATH:-}}"
+executable_dir="${BUILDKITE_PLUGIN_MONOREPO_DIFF_BINARY_FOLDER:-${BUILDKITE_PLUGINS_PATH:-}}"
 
 # Default to current directory if not set
 if [[ -z "${executable_dir}" ||  ${BUILDKITE_PLUGIN_MONOREPO_DIFF_BUILDKITE_PLUGIN_TEST_MODE:-false} == "true" ]]; then
@@ -34,7 +34,7 @@ if [[ ! -w "${executable_dir}" ]]; then
   err "Directory not writable: ${executable_dir}"
 fi
 
-executable="${executable_dir}/monorepo-diff-buildkite-plugin"
+executable="${executable_dir%/}/monorepo-diff-buildkite-plugin"
 executable_version_file="${executable}.version"
 
 check_cmd() {
@@ -202,10 +202,13 @@ download_binary_and_run() {
 }
 
 run_preinstalled_binary() {
-  local _executable="monorepo-diff-buildkite-plugin"
+  local _executable="${executable}"
 
-  if ! check_cmd "$_executable"; then
-    err "Binary '$_executable' not found in PATH. Please install it or set download: true"
+  if ! check_cmd "${_executable}"; then
+    _executable="$(basename "${executable}")"
+    if ! check_cmd "${_executable}"; then
+      err "Binary '$_executable' not found in PATH or binary_folder option. Please install it or set download: true"
+    fi
   fi
 
   ${_executable} "$@"

plugin.yml

@@ -15,7 +15,7 @@ configuration:
       type: boolean
     env:
       type: array
-    download_folder:
+    binary_folder:
       type: string
     notify:
       type: [array]