From 79a52bb1ba0303b6cfc20e024d2b7f40f4670267 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 5 Nov 2019 13:07:47 -0800 Subject: [PATCH] Add support for outputing binaries to custom dir Signed-off-by: Brian Goff --- hack/make.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index 4791211334..357e6a17bb 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -140,12 +140,17 @@ bundle() { } main() { + bundle_dir="bundles" + if [ -n "${PREFIX}" ]; then + bundle_dir="${PREFIX}/${bundle_dir}" + fi + if [ -z "${KEEPBUNDLE-}" ]; then - echo "Removing bundles/" - rm -rf bundles/* + echo "Removing ${bundle_dir}/" + rm -rf "${bundle_dir}"/* echo fi - mkdir -p bundles + mkdir -p "${bundle_dir}" if [ $# -lt 1 ]; then bundles=(${DEFAULT_BUNDLES[@]}) @@ -153,7 +158,7 @@ main() { bundles=($@) fi for bundle in ${bundles[@]}; do - export DEST="bundles/$(basename "$bundle")" + export DEST="${bundle_dir}/$(basename "$bundle")" # Cygdrive paths don't play well with go build -o. if [[ "$(uname -s)" == CYGWIN* ]]; then export DEST="$(cygpath -mw "$DEST")"