Merge pull request #3852 from dokku/standardize-plugin-code

Standardize plugin code

plugins/common/functions

@@ -295,8 +295,7 @@ get_running_image_tag() {
 
 is_image_herokuish_based() {
   declare desc="returns true if app image is based on herokuish"
-  declare IMAGE="$1"
-  declare APP="$2"
+  declare IMAGE="$1" APP="$2"
   local DOKKU_APP_USER
   if [[ -n "$APP" ]]; then
     DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
@@ -571,7 +570,7 @@ dokku_release() {
   plugn trigger builder-release "$IMAGE_SOURCE_TYPE" "$APP" "$IMAGE_TAG"
 }
 
-dokku_deploy_cmd() {
+cmd-deploy() {
   declare desc="deploy phase"
   declare APP="$1" IMAGE_TAG="$2"
   source "$PLUGIN_AVAILABLE_PATH/config/functions"
@@ -613,7 +612,7 @@ release_and_deploy() {
 
     if [[ "$DOKKU_SKIP_DEPLOY" != "true" ]]; then
       dokku_log_info1 "Deploying $APP ($IMAGE)..."
-      dokku_deploy_cmd "$APP" "$IMAGE_TAG"
+      cmd-deploy "$APP" "$IMAGE_TAG"
       dokku_log_info2 "Application deployed:"
       get_app_urls urls "$APP" | sed "s/^/       /"
     else