diff --git a/plugins/ps/functions b/plugins/ps/functions index 9664e875d..0feb92bd8 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -4,27 +4,25 @@ source "$(dirname $0)/../common/functions" 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" || dokku_log_info1_quiet "DOKKU_SCALE not found in app image" if [[ ! -f $DOKKU_SCALE_FILE ]]; then - copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" || 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) - trap 'rm -rf $TMP_WORK_DIR' EXIT + local TMP_WORK_DIR=$(mktemp -d DOKKU_SCALE.XXXXX) + trap 'rm -rf $TMP_WORK_DIR' EXIT - copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR || true - if [[ -f $TMP_WORK_DIR/Procfile ]];then - local PROCFILE="$TMP_WORK_DIR/Procfile" - while read line || [ -n "$line" ] - do - local PROC_NAME=${line%%:*} - echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE - done < "$PROCFILE" - else - echo "default=1" >> $DOKKU_SCALE_FILE - fi - - dokku_log_info1_quiet "New DOKKU_SCALE file generated" - dokku_log_info1_quiet "$(< $DOKKU_SCALE_FILE)" + copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR || true + if [[ -f $TMP_WORK_DIR/Procfile ]];then + local PROCFILE="$TMP_WORK_DIR/Procfile" + while read line || [ -n "$line" ] + do + local PROC_NAME=${line%%:*} + echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE + done < "$PROCFILE" + else + echo "default=1" >> $DOKKU_SCALE_FILE fi + + dokku_log_info1_quiet "New DOKKU_SCALE file generated" + dokku_log_info1_quiet "$(< $DOKKU_SCALE_FILE)" fi }