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

Merge pull request #1653 from callahad/SC2145

Browse Source 
Resolve SC2145: 'Argument mixes string and array.'
This commit is contained in:
Jose Diaz-Gonzalez
2015-11-05 21:57:02 -05:00
parent 0470d493ae 84c0988fd8
commit a1983e0131
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/common/functions
View File

@@ -10,16 +10,16 @@ has_tty() {
} }
dokku_log_info1() { dokku_log_info1() {
echo "-----> $@" echo "-----> $*"
} }
dokku_log_info2() { dokku_log_info2() {
echo "=====> $@" echo "=====> $*"
} }
dokku_log_info1_quiet() { dokku_log_info1_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
echo "-----> $@" echo "-----> $*"
else else
return 0 return 0
fi fi
@@ -27,31 +27,31 @@ dokku_log_info1_quiet() {
dokku_log_info2_quiet() { dokku_log_info2_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
echo "=====> $@" echo "=====> $*"
else else
return 0 return 0
fi fi
} }
dokku_col_log_info1() { dokku_col_log_info1() {
printf "%-25s %-25s %-25s %-25s\n" "-----> $@" printf "%-6s %-18s %-25s %-25s %-25s\n" "----->" "$@"
} }
dokku_col_log_info1_quiet() { dokku_col_log_info1_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
printf "%-25s %-25s %-25s %-25s\n" "-----> $@" printf "%-6s %-18s %-25s %-25s %-25s\n" "----->" "$@"
else else
return 0 return 0
fi fi
} }
dokku_col_log_info2() { dokku_col_log_info2() {
printf "%-25s %-25s %-25s %-25s\n" "=====> $@" printf "%-6s %-18s %-25s %-25s %-25s\n" "=====>" "$@"
} }
dokku_col_log_info2_quiet() { dokku_col_log_info2_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
printf "%-25s %-25s %-25s %-25s\n" "=====> $@" printf "%-6s %-18s %-25s %-25s %-25s\n" "=====>" "$@"
else else
return 0 return 0
fi fi
@@ -71,18 +71,18 @@ dokku_col_log_msg_quiet() {
dokku_log_verbose_quiet() { dokku_log_verbose_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
echo " $@" echo " $*"
else else
return 0 return 0
fi fi
} }
dokku_log_verbose() { dokku_log_verbose() {
echo " $@" echo " $*"
} }
dokku_log_warn() { dokku_log_warn() {
echo " ! $@" echo " ! $*"
} }
dokku_log_fail() { dokku_log_fail() {
@@ -98,7 +98,7 @@ dokku_log_plugn_trigger_call() {
local l_hook local l_hook
l_hook="$1" ; shift l_hook="$1" ; shift
dokku_log_event "INVOKED: ${l_hook}( $@ ) NAME=$NAME FINGERPRINT=$FINGERPRINT" dokku_log_event "INVOKED: ${l_hook}( $* ) NAME=$NAME FINGERPRINT=$FINGERPRINT"
} }
dokku_container_log_verbose_quiet() { dokku_container_log_verbose_quiet() {

2
plugins/docker-options/commands
View File

@@ -28,7 +28,7 @@ verify_phase() {
return 0 return 0
fi fi
done done
dokku_log_fail "Phase(s) must be one of [${phases[@]}]" dokku_log_fail "Phase(s) must be one of [${phases[*]}]"
} }
get_phase_file_path() { get_phase_file_path() {