Merge branch 'master' into master

plugins/apps/internal-functions

@@ -23,7 +23,7 @@ apps_help_cmd() {
     echo ''
     echo 'Example:'
     echo ''
-    echo '$ dokku apps'
+    echo '$ dokku apps:list'
     echo '=====> My Apps'
     echo 'example'
     echo 'example2'

plugins/certs/internal-functions

@@ -6,7 +6,7 @@ source "$PLUGIN_AVAILABLE_PATH/certs/functions"
 certs_help_content_func() {
   declare desc="return certs plugin help content"
   cat<<help_content
-    certs, [DEPRECATED] Alternative for certs:report
+    certs <app>, [DEPRECATED] Alternative for certs:report
     certs:add <app> CRT KEY, Add an ssl endpoint to an app. Can also import from a tarball on stdin
     certs:chain CRT [CRT ...], [NOT IMPLEMENTED] Print the ordered and complete chain for the given certificate
     certs:generate <app> DOMAIN, Generate a key and certificate signing request (and self-signed certificate)

plugins/ps/subcommands/default

@@ -8,10 +8,10 @@ ps_main_cmd() {
   [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
 
   local APP="$2"; verify_app_name "$APP"
-  local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
-
   ! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0
 
+  local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
+
   local CID
   for CID in $DOKKU_APP_RUNNING_CONTAINER_IDS; do
     has_tty && local DOKKU_RUN_OPTS="-i -t"