From e74c6460fbf6898f678fafdedc630569bbc73506 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Tue, 21 Apr 2015 20:25:05 -0700
Subject: [PATCH] make semantic sense of _image functions

---
 plugins/common/functions |  8 ++++----
 plugins/ps/functions     | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index 3d137b420..9bee74b3b 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -110,8 +110,8 @@ verify_app_name() {
   return 0
 }
 
-verify_app_image() {
-  local APP="$1"; local IMAGE="dokku/$APP"
+verify_image() {
+  local IMAGE="$1"
   DOKKU_APP_IMAGES=$(docker images -q $IMAGE)
   if [[ -n "$DOKKU_APP_IMAGES" ]]; then
     return 0
@@ -156,9 +156,9 @@ parse_args() {
 }
 
 copy_from_image() {
-  local APP="$1"; local IMAGE="dokku/$APP"; local SRC_FILE="$2"; local DST_DIR="$3"; verify_app_name $APP
+  local IMAGE="$1"; local SRC_FILE="$2"; local DST_DIR="$3"; verify_app_name $APP
 
-  if verify_app_image "$APP"; then
+  if verify_image "$IMAGE"; then
     CID=$(docker run -d $IMAGE bash)
     docker cp "$CID:$SRC_FILE" "$DST_DIR"
     docker rm -f "$CID" &> /dev/null
diff --git a/plugins/ps/functions b/plugins/ps/functions
index 49238e4fd..cf0eff73a 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -6,7 +6,7 @@ release_and_deploy() {
   source "$(dirname $0)/../common/functions"
   local APP="$1"; local IMAGE="dokku/$APP"
 
-  if verify_app_image "$APP"; then
+  if verify_image "$IMAGE"; then
     if is_image_buildstep_based "$IMAGE"; then
       IMAGE_SOURCE_TYPE="buildstep"
     else
@@ -24,16 +24,16 @@ release_and_deploy() {
 }
 
 generate_scale_file() {
-  local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
-  copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image"
+  local APP="$1"; local IMAGE="dokku/$APP"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+  copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image"
   if [[ ! -f $DOKKU_SCALE_FILE ]]; then
     local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX)
     trap 'rm -rf $TMP_WORK_DIR' EXIT
 
 
-    if is_image_buildstep_based "$APP"; then
-      copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
-      copy_from_image "$APP" /app/.release $TMP_WORK_DIR 2>/dev/null || true
+    if is_image_buildstep_based "$IMAGE"; then
+      copy_from_image "$IMAGE" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
+      copy_from_image "$IMAGE" /app/.release $TMP_WORK_DIR 2>/dev/null || true
 
       if [[ -f $TMP_WORK_DIR/Procfile ]];then
         local PROCFILE="$TMP_WORK_DIR/Procfile"