From 47b7947d2db235bf02046a1f6318c73013254d9a Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Tue, 5 Mar 2019 16:03:09 -0600 Subject: [PATCH] Fix bug in arg length to bin/release --- bin/build | 5 +++-- cmd/release/main.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/build b/bin/build index f60f936..5cd1483 100755 --- a/bin/build +++ b/bin/build @@ -8,13 +8,14 @@ set -eu bp_dir=$(cd $(dirname $0)/..; pwd) # absolute path target_dir="${bp_dir}/target" layers_dir="${1:?}" +platform_dir="${2:?}" # create a shim cache layer cache_dir="${layers_dir}/shim" mkdir -p "${cache_dir}" echo "cache = true" > ${layers_dir}/shim.toml -"${target_dir}/bin/compile" "$(pwd)" "${cache_dir}" "${2:?}/env" +"${target_dir}/bin/compile" "$(pwd)" "${cache_dir}" "${platform_dir}/env" # copy profile.d scripts into a layer so they will be sourced home_dir="${layers_dir}/home" @@ -23,4 +24,4 @@ cp .profile.d/* "${home_dir}/profile.d/" echo "launch = true" > ${layers_dir}/home.toml # run bin/release, read Procfile, and generate launch.toml -"${bp_dir}/bin/release" "${target_dir}" "${layers_dir}" +"${bp_dir}/bin/release" "${target_dir}" "${layers_dir}" "${platform_dir}" diff --git a/cmd/release/main.go b/cmd/release/main.go index 8c49b80..9693afe 100644 --- a/cmd/release/main.go +++ b/cmd/release/main.go @@ -10,8 +10,8 @@ import ( ) func main() { - if len(os.Args) != 3 { - fmt.Println("Usage:", os.Args[0], "TARGET_BUILDPACK_DIR", "LAYERS_DIR") + if len(os.Args) != 4 { + fmt.Println("Usage:", os.Args[0], "TARGET_BUILDPACK_DIR", "LAYERS_DIR", "PLATFORM_DIR") return }