Fix composer version check

cytopia · cytopia · commit 476a1dee4777 · 2022-03-30T12:46:07.000+02:00
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -526,7 +526,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -564,7 +564,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -578,7 +578,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -591,7 +591,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -572,7 +572,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -571,7 +571,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -591,7 +591,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -592,7 +592,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -592,7 +592,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
@@ -511,7 +511,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
@@ -511,7 +511,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
@@ -495,7 +495,7 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
  \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
@@ -414,7 +414,7 @@ software_available:
   # Composer is a dependency for others
   composer:
     disabled: [5.2]
-    check: composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+'
+    check: composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+'
     all:
       command: |
         curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ RUN set -eux \`
`526`	`526`
`527`	`527`	`RUN set -eux \`
`528`	`528`	`# -------------------- Software --------------------`
`529`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`529`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`530`	`530`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`531`	`531`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`532`	`532`	`\`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ RUN set -eux \`
`564`	`564`
`565`	`565`	`RUN set -eux \`
`566`	`566`	`# -------------------- Software --------------------`
`567`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`567`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`568`	`568`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`569`	`569`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`570`	`570`	`\`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ RUN set -eux \`
`578`	`578`
`579`	`579`	`RUN set -eux \`
`580`	`580`	`# -------------------- Software --------------------`
`581`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`581`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`582`	`582`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`583`	`583`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`584`	`584`	`\`
Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ RUN set -eux \`
`591`	`591`
`592`	`592`	`RUN set -eux \`
`593`	`593`	`# -------------------- Software --------------------`
`594`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`594`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`595`	`595`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`596`	`596`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`597`	`597`	`\`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ RUN set -eux \`
`572`	`572`
`573`	`573`	`RUN set -eux \`
`574`	`574`	`# -------------------- Software --------------------`
`575`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`575`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`576`	`576`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`577`	`577`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`578`	`578`	`\`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ RUN set -eux \`
`571`	`571`
`572`	`572`	`RUN set -eux \`
`573`	`573`	`# -------------------- Software --------------------`
`574`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`574`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`575`	`575`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`576`	`576`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`577`	`577`	`\`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ RUN set -eux \`
`592`	`592`
`593`	`593`	`RUN set -eux \`
`594`	`594`	`# -------------------- Software --------------------`
`595`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`595`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`596`	`596`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`597`	`597`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`598`	`598`	`\`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ RUN set -eux \`
`511`	`511`
`512`	`512`	`RUN set -eux \`
`513`	`513`	`# -------------------- Software --------------------`
`514`		`- && composer --version 2>/dev/null \| grep -E 'version\s*[0-9][.0-9]+' \`
	`514`	`+ && composer --version 2>/dev/null \| grep -Ei '(composer\|version)\s*[0-9][.0-9]+' \`
`515`	`515`	`&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`516`	`516`	`&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox \| grep -E '^v?[0-9][.0-9]+' \`
`517`	`517`	`\`