From e0f32d44b112d345aa8d91241befe8a8a33849bb Mon Sep 17 00:00:00 2001
From: Arnie <i@cechis.cz>
Date: Thu, 14 Feb 2019 15:00:04 +0100
Subject: [PATCH] Update code formatter

---
 code-formatter/Dockerfile                        | 4 +---
 code-formatter/Dockerfile.56                     | 4 +---
 code-formatter/Makefile                          | 3 +--
 code-formatter/src/entry.sh                      | 9 +++++++--
 code-formatter/src/inc/formatters/csscomb.shinc  | 5 +++--
 code-formatter/src/inc/formatters/prettier.shinc | 5 +++--
 code-formatter/src/inc/process.shinc             | 6 ++++--
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/code-formatter/Dockerfile b/code-formatter/Dockerfile
index a93ce45..1f5970f 100644
--- a/code-formatter/Dockerfile
+++ b/code-formatter/Dockerfile
@@ -22,9 +22,7 @@ RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14
 WORKDIR /app
 
 # add csscomb and prettier
-RUN yarn add prettier csscomb --global && \
-  ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
-  ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
+RUN npm install prettier csscomb --global
 
 COPY ["src/entry.sh", "/app/entry.sh"]
 
diff --git a/code-formatter/Dockerfile.56 b/code-formatter/Dockerfile.56
index ce4bc01..4a8ccae 100644
--- a/code-formatter/Dockerfile.56
+++ b/code-formatter/Dockerfile.56
@@ -20,9 +20,7 @@ RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14
 WORKDIR /app
 
 # add csscomb and prettier
-RUN yarn add prettier csscomb --global && \
-  ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
-  ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
+RUN npm install prettier csscomb --global
 
 COPY ["src/entry.sh", "/app/entry.sh"]
 
diff --git a/code-formatter/Makefile b/code-formatter/Makefile
index 084509a..85f8a6a 100644
--- a/code-formatter/Makefile
+++ b/code-formatter/Makefile
@@ -17,14 +17,13 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
 
 VERSION := $(or $(GIT_TAG),latest)
 
-all : VERSION := 1.0.4
+all : VERSION := 1.1.0
 all : build release
 .PHONY : all
 
 
 build :
 	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 .
-	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 .
 	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)
 	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):latest
 
diff --git a/code-formatter/src/entry.sh b/code-formatter/src/entry.sh
index b0e41e7..5ae95fa 100755
--- a/code-formatter/src/entry.sh
+++ b/code-formatter/src/entry.sh
@@ -49,13 +49,18 @@ main() {
 		prettier)
 			__initVariables "$@"
 			source ${INCLUDES_PATH}/formatters/prettier.shinc
-			__prettier
+			if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
+				__prettier ${CSS_FILES[@]}
+			fi
+			if [[ ${#JS_FILES[@]} -ne 0 ]]; then
+				__prettier ${JS_FILES[@]}
+			fi
 			return $?
 			;;
 		csscomb)
 			__initVariables "$@"
 			source ${INCLUDES_PATH}/formatters/csscomb.shinc
-			__csscomb
+			__csscomb ${CSS_FILES[@]}
 			return $?
 			;;
 		php-cs-fixer)
diff --git a/code-formatter/src/inc/formatters/csscomb.shinc b/code-formatter/src/inc/formatters/csscomb.shinc
index a26f474..66d9d9b 100644
--- a/code-formatter/src/inc/formatters/csscomb.shinc
+++ b/code-formatter/src/inc/formatters/csscomb.shinc
@@ -3,11 +3,12 @@
 
 __csscomb() {
 	__msg "Csscomb:"
+	local files="${1}"
 
 	if [[ ${DRY_RUN} -eq 0 ]]; then
-		csscomb -v "${CSS_FILES[@]}"
+		csscomb -v "${files[@]}"
 	else
-		csscomb --lint -v "${CSS_FILES[@]}"
+		csscomb --lint -v "${files[@]}"
 	fi
 
 	return $?
diff --git a/code-formatter/src/inc/formatters/prettier.shinc b/code-formatter/src/inc/formatters/prettier.shinc
index 4e2acb3..0aab15f 100644
--- a/code-formatter/src/inc/formatters/prettier.shinc
+++ b/code-formatter/src/inc/formatters/prettier.shinc
@@ -3,12 +3,13 @@
 
 __prettier() {
 	__msg "Prettier:"
+	local files="${1}"
 
 	if [[ ${DRY_RUN} -eq 0 ]]; then
-		prettier --write "${JS_FILES[@]}"
+		prettier --write "${files[@]}"
 	else
 		__msg "Listing (: unprettiered :) files:" 1
-		prettier --list-different "${JS_FILES[@]}"
+		prettier --list-different "${files[@]}"
 	fi
 
 	return $?
diff --git a/code-formatter/src/inc/process.shinc b/code-formatter/src/inc/process.shinc
index 8513a08..91cad24 100644
--- a/code-formatter/src/inc/process.shinc
+++ b/code-formatter/src/inc/process.shinc
@@ -11,13 +11,15 @@ process() {
 
 	# Run css comb
 	if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
-		__csscomb
+		__csscomb "${CSS_FILES[@]}"
+		[[ $? -ne 0 ]] && failed=1
+		__prettier "${CSS_FILES[@]}"
 		[[ $? -ne 0 ]] && failed=1
 	fi
 
 	# Run JS prettier
 	if [[ ${#JS_FILES[@]} -ne 0 ]]; then
-		__prettier
+		__prettier "${JS_FILES[@]}"
 		[[ $? -ne 0 ]] && failed=1
 	fi