From 6462dd891c7743aa3258662e0bc6846b198bbd5d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 28 Feb 2021 15:29:20 -0500
Subject: [PATCH] chore: rename builder-cnb to builder-pack

---
 docs/appendices/0.24.0-migration-guide.md             | 1 +
 plugins/builder-cnb/plugin.toml                       | 4 ----
 plugins/{builder-cnb => builder-pack}/builder-build   | 6 +++---
 plugins/{builder-cnb => builder-pack}/builder-detect  | 6 +++---
 plugins/{builder-cnb => builder-pack}/builder-release | 6 +++---
 plugins/builder-pack/plugin.toml                      | 4 ++++
 6 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 plugins/builder-cnb/plugin.toml
 rename plugins/{builder-cnb => builder-pack}/builder-build (90%)
 rename plugins/{builder-cnb => builder-pack}/builder-detect (73%)
 rename plugins/{builder-cnb => builder-pack}/builder-release (81%)
 create mode 100644 plugins/builder-pack/plugin.toml

diff --git a/docs/appendices/0.24.0-migration-guide.md b/docs/appendices/0.24.0-migration-guide.md
index d4fa0a7ea..f55d81c2f 100644
--- a/docs/appendices/0.24.0-migration-guide.md
+++ b/docs/appendices/0.24.0-migration-guide.md
@@ -3,3 +3,4 @@
 ## Changes
 
 - The commands `proxy:enable`, `proxy:disable` and `proxy:build-config` now support the `--all` flag in addition to general parallelism.
+- The `builder-cnb` plugin has been renamed `builder-pack`
diff --git a/plugins/builder-cnb/plugin.toml b/plugins/builder-cnb/plugin.toml
deleted file mode 100644
index 65e913fe1..000000000
--- a/plugins/builder-cnb/plugin.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[plugin]
-description = "dokku core builder-cnb plugin"
-version = "0.23.9"
-[plugin.config]
diff --git a/plugins/builder-cnb/builder-build b/plugins/builder-pack/builder-build
similarity index 90%
rename from plugins/builder-cnb/builder-build
rename to plugins/builder-pack/builder-build
index 22f98900f..10854f868 100755
--- a/plugins/builder-cnb/builder-build
+++ b/plugins/builder-pack/builder-build
@@ -4,8 +4,8 @@ set -eo pipefail
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
-trigger-builder-cnb-builder-build() {
-  declare desc="builder-cnb builder-build plugin trigger"
+trigger-builder-pack-builder-build() {
+  declare desc="builder-pack builder-build plugin trigger"
   declare trigger="builder-build"
   declare BUILDER_TYPE="$1" APP="$2" SOURCECODE_WORK_DIR="$3"
 
@@ -42,4 +42,4 @@ trigger-builder-cnb-builder-build() {
   plugn trigger post-build-cnb "$APP" "$SOURCECODE_WORK_DIR"
 }
 
-trigger-builder-cnb-builder-build "$@"
+trigger-builder-pack-builder-build "$@"
diff --git a/plugins/builder-cnb/builder-detect b/plugins/builder-pack/builder-detect
similarity index 73%
rename from plugins/builder-cnb/builder-detect
rename to plugins/builder-pack/builder-detect
index 65678e55d..b40d1d52f 100755
--- a/plugins/builder-cnb/builder-detect
+++ b/plugins/builder-pack/builder-detect
@@ -3,8 +3,8 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 
-trigger-builder-cnb-builder-detect() {
-  declare desc="builder-cnb builder-detect plugin trigger"
+trigger-builder-pack-builder-detect() {
+  declare desc="builder-pack builder-detect plugin trigger"
   declare trigger="builder-detect"
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
 
@@ -19,4 +19,4 @@ trigger-builder-cnb-builder-detect() {
   fi
 }
 
-trigger-builder-cnb-builder-detect "$@"
+trigger-builder-pack-builder-detect "$@"
diff --git a/plugins/builder-cnb/builder-release b/plugins/builder-pack/builder-release
similarity index 81%
rename from plugins/builder-cnb/builder-release
rename to plugins/builder-pack/builder-release
index e3bb97d6b..95e028369 100755
--- a/plugins/builder-cnb/builder-release
+++ b/plugins/builder-pack/builder-release
@@ -3,8 +3,8 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-trigger-builder-cnb-builder-release() {
-  declare desc="builder-cnb builder-release plugin trigger"
+trigger-builder-pack-builder-release() {
+  declare desc="builder-pack builder-release plugin trigger"
   declare trigger="builder-release"
   declare BUILDER_TYPE="$1" APP="$2" IMAGE_TAG="$3"
 
@@ -19,4 +19,4 @@ trigger-builder-cnb-builder-release() {
   plugn trigger post-release-cnb "$APP" "$IMAGE_TAG"
 }
 
-trigger-builder-cnb-builder-release "$@"
+trigger-builder-pack-builder-release "$@"
diff --git a/plugins/builder-pack/plugin.toml b/plugins/builder-pack/plugin.toml
new file mode 100644
index 000000000..3ff193f2a
--- /dev/null
+++ b/plugins/builder-pack/plugin.toml
@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core builder-pack plugin"
+version = "0.23.9"
+[plugin.config]