Update github-config to d86b31c

paketo-bot · joshzarrabi · commit 114357b07c34 · 2020-07-13T13:26:42.000-07:00
diff --git a/scripts/package.sh b/scripts/package.sh
@@ -8,6 +8,12 @@ readonly ROOT_DIR="$(cd "$(dirname "${0}")/.." && pwd)"
 readonly BIN_DIR="${ROOT_DIR}/.bin"
 readonly BUILD_DIR="${ROOT_DIR}/build"
 
+# shellcheck source=.util/tools.sh
+source "${ROOT_DIR}/scripts/.util/tools.sh"
+
+# shellcheck source=.util/print.sh
+source "${ROOT_DIR}/scripts/.util/print.sh"
+
 function main {
   local version
 
@@ -24,50 +30,24 @@ function main {
         ;;
 
       *)
-        echo "unknown argument \"${1}\""
-        exit 1
+        util::print::error "unknown argument \"${1}\""
     esac
   done
 
-  if [[ "${version}" == "" ]]; then
-    echo "--version is required"
-    exit 1
+  if [[ "${version:-}" == "" ]]; then
+    util::print::error "--version is required"
   fi
 
-  os::check
   repo::prepare
 
-  tools::jam::install
-  tools::yj::install
-  tools::pack::install
+  util::tools::pack::install --directory "${BIN_DIR}"
 
   buildpack::archive "${version}"
-  buildpackage::toml::write
   buildpackage::create
 }
 
-function os::check() {
-  local os
-
-  case "$(uname)" in
-    "Darwin")
-      os="macos"
-      ;;
-
-    "Linux")
-      os="linux"
-      ;;
-
-    *)
-      echo "Unknown OS \"$(uname)\""
-      exit 1
-  esac
-
-  readonly OS="${os}"
-}
-
 function repo::prepare() {
-  echo "-> Preparing repo..."
+  util::print::title "Preparing repo..."
 
   rm -rf "${BUILD_DIR}"
 
@@ -77,72 +57,27 @@ function repo::prepare() {
   export PATH="${BIN_DIR}:${PATH}"
 }
 
-function tools::jam::install() {
-  echo "-> Installing v0.0.14 jam..."
-
-  local os
-  os="${OS}"
-  if [[ "${os}" == "macos" ]]; then
-    os="darwin"
-  fi
-
-  curl "https://github.com/paketo-buildpacks/packit/releases/download/v0.0.14/jam-${os}" \
-    --silent \
-    --location \
-    --output "${BIN_DIR}/jam"
-  chmod +x "${BIN_DIR}/jam"
-}
-
-function tools::yj::install() {
-  echo "-> Installing v4.0.0 yj..."
-
-  curl "https://github.com/sclevine/yj/releases/download/v4.0.0/yj-${OS}" \
-    --silent \
-    --location \
-    --output "${BIN_DIR}/yj"
-  chmod +x "${BIN_DIR}/yj"
-}
-
-function tools::pack::install() {
-  echo "-> Installing v0.10.0 pack..."
-
-  curl "https://github.com/buildpacks/pack/releases/download/v0.10.0/pack-v0.10.0-${OS}.tgz" \
-    --silent \
-    --location \
-    --output /tmp/pack.tgz
-  tar xzf /tmp/pack.tgz -C "${BIN_DIR}"
-  chmod +x "${BIN_DIR}/pack"
-  rm /tmp/pack.tgz
-}
-
 function buildpack::archive() {
   local version
   version="${1}"
 
-  echo "-> Packaging family buildpack into ${BUILD_DIR}/buildpack.tgz..."
+  util::print::title "Packaging buildpack into ${BUILD_DIR}/buildpack.tgz..."
+
+  util::tools::jam::install --directory "${BIN_DIR}"
 
   jam pack \
     --buildpack "${ROOT_DIR}/buildpack.toml" \
     --version "${version}" \
+    --offline \
     --output "${BUILD_DIR}/buildpack.tgz"
 }
 
-function buildpackage::toml::write() {
-  echo "-> Generating package config in ${BUILD_DIR}/package.toml..."
-
-  yj -tj < "${ROOT_DIR}/buildpack.toml" \
-    | jq -r '.metadata.dependencies[] | select(.id != "lifecycle") | {uri: .uri }' \
-    | jq -s --arg uri "${BUILD_DIR}/buildpack.tgz" '. | {buildpack: {uri: $uri}, dependencies: .}' \
-    | yj -jt \
-    > "${BUILD_DIR}/package.toml"
-}
-
 function buildpackage::create() {
-  echo "-> Packaging buildpack..."
+  util::print::title "Packaging buildpack..."
 
   pack \
     package-buildpack "${BUILD_DIR}/buildpackage.cnb" \
-      --package-config "${BUILD_DIR}/package.toml" \
+      --package-config "${ROOT_DIR}/package.toml" \
       --format file
 }
 
