From d5cc7595fd9224b8cb6812e17f218de150091ba2 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Sat, 18 Apr 2015 10:38:07 -0700
Subject: [PATCH] default web proc. avoid unclear file not found error when
 procfile is missing

---
 plugins/ps/functions | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/ps/functions b/plugins/ps/functions
index 4c5a1a398..73b2d6de9 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -6,7 +6,7 @@ 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"
   if [[ ! -f $DOKKU_SCALE_FILE ]]; then
-    local TMP_WORK_DIR=$(mktemp -d DOKKU_SCALE.XXXXX)
+    local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX)
     trap 'rm -rf $TMP_WORK_DIR' EXIT
 
     copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
@@ -17,16 +17,18 @@ generate_scale_file() {
     elif [[ -f $TMP_WORK_DIR/.release ]];then
       local PROCFILE="$TMP_WORK_DIR/.release"
     else
-      echo "default=1" >> $DOKKU_SCALE_FILE
+      echo "web=1" >> $DOKKU_SCALE_FILE
     fi
 
-    while read line || [ -n "$line" ]
-    do
-      local PROC_NAME=${line%%:*}
-      local PROC_CMD=${line#*:}
-      [[ "$PROC_NAME" =~ -.* ]] && continue
-      [[ -n "$PROC_CMD" ]] && echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE
-    done < "$PROCFILE"
+    if [[ -f $PROCFILE ]]; then
+      while read line || [ -n "$line" ]
+      do
+        local PROC_NAME=${line%%:*}
+        local PROC_CMD=${line#*:}
+        [[ "$PROC_NAME" =~ -.* ]] && continue
+        [[ -n "$PROC_CMD" ]] && echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE
+      done < "$PROCFILE"
+    fi
 
     dokku_log_info1_quiet "New DOKKU_SCALE file generated"
     dokku_log_info1_quiet "$(< $DOKKU_SCALE_FILE)"