From 8f12b643b82c307d403e7ce3ad5c8d155f21333f Mon Sep 17 00:00:00 2001 From: Arnie Date: Mon, 25 Dec 2017 09:42:09 +0100 Subject: [PATCH] Fix calling commands individually --- src/inc/formatters/csscomb.shinc | 4 ++-- src/inc/formatters/php-cs-fixer.shinc | 1 + src/inc/formatters/prettier.shinc | 4 ++-- src/inc/process.shinc | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/inc/formatters/csscomb.shinc b/src/inc/formatters/csscomb.shinc index f5f3388..a26f474 100644 --- a/src/inc/formatters/csscomb.shinc +++ b/src/inc/formatters/csscomb.shinc @@ -5,9 +5,9 @@ __csscomb() { __msg "Csscomb:" if [[ ${DRY_RUN} -eq 0 ]]; then - csscomb -v "$@" + csscomb -v "${CSS_FILES[@]}" else - csscomb --lint -v "$@" + csscomb --lint -v "${CSS_FILES[@]}" fi return $? diff --git a/src/inc/formatters/php-cs-fixer.shinc b/src/inc/formatters/php-cs-fixer.shinc index fa1f38b..8f0d500 100644 --- a/src/inc/formatters/php-cs-fixer.shinc +++ b/src/inc/formatters/php-cs-fixer.shinc @@ -10,6 +10,7 @@ __phpFixer() { if [[ ${DRY_RUN} -eq 0 ]]; then for file in "${PHP_FILES[@]}"; do php-cs-fixer fix "${file}" + [[ $? -ne 0 ]] && failed=1 done else local needs_fixing=() diff --git a/src/inc/formatters/prettier.shinc b/src/inc/formatters/prettier.shinc index 4fb34b9..4e2acb3 100644 --- a/src/inc/formatters/prettier.shinc +++ b/src/inc/formatters/prettier.shinc @@ -5,10 +5,10 @@ __prettier() { __msg "Prettier:" if [[ ${DRY_RUN} -eq 0 ]]; then - prettier --write "$@" + prettier --write "${JS_FILES[@]}" else __msg "Listing (: unprettiered :) files:" 1 - prettier --list-different "$@" + prettier --list-different "${JS_FILES[@]}" fi return $? diff --git a/src/inc/process.shinc b/src/inc/process.shinc index f8b2186..8513a08 100644 --- a/src/inc/process.shinc +++ b/src/inc/process.shinc @@ -11,19 +11,19 @@ process() { # Run css comb if [[ ${#CSS_FILES[@]} -ne 0 ]]; then - __csscomb "${CSS_FILES[@]}" + __csscomb [[ $? -ne 0 ]] && failed=1 fi # Run JS prettier if [[ ${#JS_FILES[@]} -ne 0 ]]; then - __prettier "${JS_FILES[@]}" + __prettier [[ $? -ne 0 ]] && failed=1 fi # Run PHP cs fixer if [[ ${#PHP_FILES[@]} -ne 0 ]]; then - __phpFixer ${PHP_FILES[@]} + __phpFixer [[ $? -ne 0 ]] && failed=1 fi