From 0cc9e42c5946f3a442c45a2d2de619d6117261b1 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 22 Apr 2017 21:09:27 -0600
Subject: [PATCH] fix: check IS_HEROKUISH_CONTAINER value check

---
 plugins/common/functions  | 11 +++++++----
 plugins/network/functions |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index 506e6e707..550e08692 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -539,11 +539,14 @@ dokku_deploy_cmd() {
   source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
   [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
+  local APP="$1" IMAGE_TAG="$2"
+  local DOKKU_HEROKUISH IMAGE
+  DOKKU_HEROKUISH=false
+  IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
   verify_app_name "$APP"
   plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
 
-  is_image_herokuish_based "$IMAGE" && local DOKKU_HEROKUISH=true
+  is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
   local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
   local oldids=$(get_app_container_ids "$APP")
 
@@ -581,9 +584,9 @@ dokku_deploy_cmd() {
       DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
 
-      [[ -n "$DOKKU_HEROKUISH" ]] && local START_CMD="/start $PROC_TYPE"
+      [[ "$DOKKU_HEROKUISH" == "true" ]] && local START_CMD="/start $PROC_TYPE"
 
-      if [[ -z "$DOKKU_HEROKUISH" ]]; then
+      if [[ "$DOKKU_HEROKUISH" == "false" ]]; then
         local DOKKU_DOCKERFILE_START_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_START_CMD || true)
         local DOKKU_PROCFILE_START_CMD=$(get_cmd_from_procfile "$APP" "$PROC_TYPE")
         local START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
diff --git a/plugins/network/functions b/plugins/network/functions
index 934742e68..0eb97d12c 100755
--- a/plugins/network/functions
+++ b/plugins/network/functions
@@ -53,7 +53,7 @@ network-compute-container-ports() {
     return
   fi
 
-  if [[ -z "$IS_HEROKUISH_CONTAINER" ]]; then
+  if [[ "$IS_HEROKUISH_CONTAINER" == "false" ]]; then
     DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
   fi
 
@@ -121,7 +121,7 @@ network-get-container-port() {
     return
   fi
 
-  if [[ -z "$IS_HEROKUISH_CONTAINER" ]]; then
+  if [[ "$IS_HEROKUISH_CONTAINER" == "false" ]]; then
     local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
   fi