refactor: package script more reusable

scripts/package.sh

@@ -144,31 +144,15 @@ function buildpackage::create() {
 
   util::print::title "Packaging ${buildpack_type}... ${output}"
 
-  if [ "$buildpack_type" == "extension" ]; then
-    cwd=$(pwd)
-    cd ${BUILD_DIR}
-    mkdir cnbdir
-    cd cnbdir
-    cp ../buildpack.tgz .
-    tar -xvf buildpack.tgz
-    rm buildpack.tgz
-
-    pack \
-      extension package "${output}" \
-        --format file
-
-    cd $cwd
-  else
-    mkdir ${BUILD_DIR}/cnbdir
-    tar -xvf ${BUILD_DIR}/buildpack.tgz -C ${BUILD_DIR}/cnbdir
+  mkdir ${BUILD_DIR}/cnbdir
+  tar -xvf ${BUILD_DIR}/buildpack.tgz -C ${BUILD_DIR}/cnbdir
 
-    pack \
-      buildpack package "${output}" \
-        --path ${BUILD_DIR}/cnbdir \
-        --format file
+  pack \
+    "${buildpack_type}" package "${output}" \
+      --path ${BUILD_DIR}/cnbdir \
+      --format file
 
-    rm -rf ${BUILD_DIR}/cnbdir
-  fi
+  rm -rf ${BUILD_DIR}/cnbdir
 }
 
 main "${@:-}"

scripts/publish.sh

@@ -75,9 +75,9 @@ function main {
 
 function usage() {
   cat <<-USAGE
-package.sh --version <version> [OPTIONS]
+publish.sh --version <version> [OPTIONS]
 
-Packages a buildpack or an extension into a buildpackage .cnb file.
+Publishes a buildpack or an extension in to a registry.
 
 OPTIONS
   -h, --help                          Prints the command usage