github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: unify error output when an app is not declared

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-03-12 21:26:19 -06:00
parent 7bbad9f074
commit 2bcad2014b
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/development/plugin-creation.md
View File

@@ -30,7 +30,7 @@ hello_main_cmd() {
set -- $cmd $@ set -- $cmd $@
## ##
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$2" verify_app_name "$2"
local APP="$2"; local APP="$2";
@@ -58,7 +58,7 @@ hello_world_cmd() {
set -- $cmd $@ set -- $cmd $@
## ##
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$2" verify_app_name "$2"
local APP="$2"; local APP="$2";

2
plugins/common/functions
View File

@@ -530,7 +530,7 @@ dokku_deploy_cmd() {
source "$PLUGIN_AVAILABLE_PATH/config/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/proxy/functions" source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
[[ -z $1 ]] && dokku_log_fail "Please specify an app to deploy" [[ -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"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
verify_app_name "$APP" verify_app_name "$APP"
plugn trigger pre-deploy "$APP" "$IMAGE_TAG" plugn trigger pre-deploy "$APP" "$IMAGE_TAG"

2
plugins/nginx-vhosts/subcommands/access-logs
View File

@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
nginx_logs_cmd() { nginx_logs_cmd() {
declare desc="display app nginx logs from command line" declare desc="display app nginx logs from command line"
local cmd="$1" local cmd="$1"
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
nginx_logs "$@" nginx_logs "$@"
} }

2
plugins/nginx-vhosts/subcommands/build-config
View File

@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
nginx_build_config_cmd() { nginx_build_config_cmd() {
declare desc="build nginx config to proxy app containers from command line" declare desc="build nginx config to proxy app containers from command line"
local cmd="nginx:build-config" local cmd="nginx:build-config"
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
nginx_build_config "$2" nginx_build_config "$2"
} }

2
plugins/storage/functions
View File

@@ -6,7 +6,7 @@ storage_list_cmd() {
declare desc="List all bound mounts" declare desc="List all bound mounts"
local cmd="storage:list" local cmd="storage:list"
local passed_phases="deploy" local passed_phases="deploy"
[[ ! $2 ]] && dokku_log_fail "storage:list requires an app to list." [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$2" && local APP="$2" verify_app_name "$2" && local APP="$2"
echo "$APP volume bind-mounts:" echo "$APP volume bind-mounts:"
get_bind_mounts "$(get_phase_file_path "$passed_phases")" get_bind_mounts "$(get_phase_file_path "$passed_phases")"