more style/function tweaks

plugins/apps/subcommands/destroy

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 apps_destroy_cmd() {
   local desc="destroys an app"
@@ -8,35 +9,8 @@ apps_destroy_cmd() {
   [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
   [[ "$2" == "tls" ]] && dokku_log_fail "Unable to destroy tls directory"
   [[ "$3" == "force" ]] && export DOKKU_APPS_FORCE_DELETE=1
-  local APP="$2"; local IMAGE_TAG=$(get_running_image_tag "$APP")
-  verify_app_name "$APP"
-
-  if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
-    dokku_log_warn "WARNING: Potentially Destructive Action"
-    dokku_log_warn "This command will destroy $APP (including all add-ons)."
-    dokku_log_warn "To proceed, type \"$APP\""
-    echo ""
-
-    read -rp "> " app_name
-    if [[ "$app_name" != "$APP" ]]; then
-      dokku_log_fail "Confirmation did not match $APP. Aborted."
-    fi
-  fi
-
-  echo "Destroying $APP (including all add-ons)"
-
-  plugn trigger pre-delete "$APP" "$IMAGE_TAG"
-  local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
-  local cid
-
-  if [[ -n $DOKKU_APP_CIDS ]]; then
-    for cid in $DOKKU_APP_CIDS; do
-      docker stop "$cid" > /dev/null || true
-      docker rm "$cid"  > /dev/null || true
-    done
-  fi
-
-  plugn trigger post-delete "$APP" "$IMAGE_TAG"
+  local APP="$2"
+  apps_destroy "$APP"
 }
 
 apps_destroy_cmd "$@"

plugins/apps/subcommands/rename

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 apps_rename_cmd() {
   local desc="renames an app"
@@ -14,11 +16,11 @@ apps_rename_cmd() {
   docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$DOKKU_ROOT/$OLD_APP/cache:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   rm -rf "$DOKKU_ROOT/$OLD_APP/cache"
   cp -a "$DOKKU_ROOT/$OLD_APP/." "$DOKKU_ROOT/$NEW_APP"
-  dokku apps:destroy "$OLD_APP" --force
+  DOKKU_APPS_FORCE_DELETE=1 apps_destroy "$OLD_APP"
   sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS"
   sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST"
   sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
-  dokku ps:rebuild "$NEW_APP"
+  ps_rebuild "$NEW_APP"
   plugn trigger post-app-rename "$OLD_APP" "$NEW_APP"
   echo "Renaming $OLD_APP to $NEW_APP... done"
 }