use the same scripts layout as the other buildpacks are using.

Author: ramonskie

config.json

@@ -1,13 +1,19 @@
 {
-  "language": "java",
+  "stack": "cflinuxfs4",
   "oses": [
     "linux"
   ],
-  "scripts": {
-    "build": "./scripts/build.sh",
-    "unit": "./scripts/unit.sh",
-    "integration": "./scripts/integration.sh",
-    "brats": "./scripts/brats.sh",
-    "package": "./scripts/package.sh"
+  "integration": {
+    "harness": "switchblade",
+    "matrix": [
+      {
+        "cached": false,
+        "parallel": true
+      },
+      {
+        "cached": true,
+        "parallel": true
+      }
+    ]
   }
-}
+}

scripts/build.sh

@@ -1,45 +1,41 @@
 #!/usr/bin/env bash
-set -euo pipefail
 
-# Add GOPATH bin to PATH
-export PATH="${PATH}:${HOME}/go/bin"
+set -e
+set -u
+set -o pipefail
 
-cd "$( dirname "${BASH_SOURCE[0]}" )/.."
-source ./scripts/install_tools.sh
+ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+readonly ROOTDIR
 
-ROOTDIR="$(pwd)"
+# shellcheck source=SCRIPTDIR/.util/tools.sh
+source "${ROOTDIR}/scripts/.util/tools.sh"
 
-# Find all CLI packages
-IFS=" " read -r -a binaries <<< "$(find "${ROOTDIR}/src/java" -name cli -type d -print0 | xargs -0)"
+function main() {
+  util::tools::jq::install --directory "${ROOTDIR}/.bin"
 
-# Read supported OSes from config.json
-if [[ -f "${ROOTDIR}/config.json" ]]; then
-    IFS=" " read -r -a oses <<< "$(jq -r -S '.oses[]' "${ROOTDIR}/config.json" | xargs)"
-else
-    # Default to linux if config.json doesn't exist yet
-    oses=("linux")
-fi
+  IFS=" " read -r -a oses <<< "$(jq -r -S '.oses[]' "${ROOTDIR}/config.json" | xargs)"
+  
+  mapfile -t binaries < <(find "${ROOTDIR}/src" -mindepth 2 -name cli -type d)
 
-# Build for each OS
-for os in "${oses[@]}"; do
+  for os in "${oses[@]}"; do
     for path in "${binaries[@]}"; do
-        name="$(basename "$(dirname "${path}")")"
-        output="${ROOTDIR}/bin/${name}"
-        
-        if [[ "${os}" == "windows" ]]; then
-            output="${output}.exe"
-        fi
-        
-        # Remove existing file (could be bash wrapper or old binary)
-        rm -f "${output}"
-        
-        echo "-----> Building ${name} for ${os}"
-        CGO_ENABLED=0 GOOS="${os}" go build \
-            -mod vendor \
-            -ldflags="-s -w" \
-            -o "${output}" \
+      local name output
+      name="$(basename "$(dirname "${path}")")"
+      output="${ROOTDIR}/bin/${name}"
+
+      if [[ "${os}" == "windows" ]]; then
+        output="${output}.exe"
+      fi
+
+      CGO_ENABLED=0 \
+      GOOS="${os}" \
+        go build \
+          -mod vendor \
+          -ldflags="-s -w" \
+          -o "${output}" \
             "${path}"
     done
-done
+  done
+}
 
-echo "-----> Build complete"
+main "${@:-}"

scripts/install_tools.sh

@@ -5,6 +5,12 @@ set -euo pipefail
 ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 readonly ROOTDIR
 
+# shellcheck source=SCRIPTDIR/.util/print.sh
+source "${ROOTDIR}/scripts/.util/print.sh"
+
+# shellcheck source=SCRIPTDIR/.util/tools.sh
+source "${ROOTDIR}/scripts/.util/tools.sh"
+
 function usage() {
   cat <<-USAGE
 integration.sh --github-token <token> [OPTIONS]
@@ -34,7 +40,7 @@ USAGE
 
 function main() {
   local src stack platform token cached parallel keep_failed
-  src="${ROOTDIR}/src/integration"
+  src="${ROOTDIR}/src/java/integration"
   stack="${CF_STACK:-cflinuxfs4}"
   platform="cf"
   cached="false"
@@ -99,7 +105,6 @@ function main() {
   echo "Cached:             ${cached}"
   echo "Parallel:           ${parallel}"
   echo "Keep Failed:        ${keep_failed}"
-  echo "Buildpack:          ${BUILDPACK_FILE}"
   echo ""
 
   specs::run "${cached}" "${parallel}" "${stack}" "${platform}" "${token}" "${keep_failed}"
@@ -151,4 +156,30 @@ function specs::run() {
          ${keep_failed_flag}
 }
 
+function buildpack::package() {
+  local version cached stack
+  version="${1}"
+  cached="${2}"
+  stack="${3}"
+
+  local name cached_flag
+  name="buildpack-${stack}-v${version}-uncached.zip"
+  cached_flag=""
+  if [[ "${cached}" == "true" ]]; then
+    cached_flag="--cached"
+    name="buildpack-${stack}-v${version}-cached.zip"
+  fi
+
+  local output
+  output="$(mktemp -d)/${name}"
+
+  CF_STACK="${stack}" bash "${ROOTDIR}/scripts/package.sh" \
+    --version "${version}" \
+    --output "${output}" \
+    --stack "${stack}" \
+    ${cached_flag} > /dev/null
+
+  printf "%s" "${output}"
+}
+
 main "${@:-}"