From 75525a1acbfae6d4b087055195c774eb964ba12c Mon Sep 17 00:00:00 2001
From: Thomas Metois <thomas@netlor.fr>
Date: Fri, 10 Mar 2017 14:28:47 +0100
Subject: [PATCH 1/2] EVO: script update-all > fix composer sign & php lib

---
 scripts/update-all.sh | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/scripts/update-all.sh b/scripts/update-all.sh
index f8763eb..36e0f22 100755
--- a/scripts/update-all.sh
+++ b/scripts/update-all.sh
@@ -8,10 +8,16 @@ pull_if_exists() {
 	fi
 }
 
+phpcommand=`command -v php`
+if [[ -z "$phpcommand" ]]; then
+	echo "PHP must be installed"
+	exit 1
+fi
+
 gitcommand=`command -v git`
 if [[ -z "$gitcommand" ]]; then
 	echo "Git must be installed"
-	exit
+	exit 1
 fi
 
 $gitcommand pull
@@ -20,12 +26,19 @@ composercommand=`command -v composer`
 if [[ -z "$composercommand" ]]; then
 	if [[ ! -f "composer.phar" ]]; then
 		# https://getcomposer.org/download/
-		php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-		php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-		php composer-setup.php
-		php -r "unlink('composer-setup.php');"
+		# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+		EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig)
+		$phpcommand -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+		ACTUAL_SIGNATURE=$($phpcommand -r "echo hash_file('SHA384', 'composer-setup.php');")
+		if [[ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]]; then
+			echo "Error download composer (different hash"
+			rm composer-setup.php
+			exit 1
+		fi
+		$phpcommand composer-setup.php --quiet
+		rm composer-setup.php
 	fi
-	php composer.phar update -o
+	$phpcommand composer.phar update -o
 else
 	$composercommand update -o
 fi
@@ -65,7 +78,7 @@ fi
 
 
 if [ -d $pathCore ]; then
-	/opt/php-7.0.5/bin/php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathCore/migrations/phinx.php
+	$phpcommand ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathCore/migrations/phinx.php
 	if [ -d "${pathCore}/hooks" ]; then
 		cd $pathCore/.git/hooks
 		ln -s ../../hooks/pre-commit.sh pre-commit 2>/dev/null
@@ -75,7 +88,7 @@ if [ -d $pathCore ]; then
 fi
 
 if [ -d $pathBO ]; then
-	/opt/php-7.0.5/bin/php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathBO/migrations/phinx.php
+	$phpcommand ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathBO/migrations/phinx.php
 
 	if [ -d "${pathBO}/hooks" ]; then
 		cd $pathBO/.git/hooks
@@ -86,7 +99,7 @@ if [ -d $pathBO ]; then
 fi
 
 if [ -d $pathFO ]; then
-	/opt/php-7.0.5/bin/php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathFO/migrations/phinx.php
+	$phpcommand ./vendor/robmorgan/phinx/bin/phinx migrate -c ./$pathFO/migrations/phinx.php
 
 	if [ -d "$pathFO/hooks" ]; then
 		cd $pathFO/.git/hooks
@@ -112,9 +125,9 @@ fi
 ./scripts/compile_translations.sh
 
 # Clear doctrine cache
-/opt/php-7.0.5/bin/php ./public/index.php orm:clear-cache:metadata
-/opt/php-7.0.5/bin/php ./public/index.php orm:clear-cache:query
-/opt/php-7.0.5/bin/php ./public/index.php orm:clear-cache:result
+$phpcommand ./public/index.php orm:clear-cache:metadata
+$phpcommand ./public/index.php orm:clear-cache:query
+$phpcommand ./public/index.php orm:clear-cache:result
 
 # Clear ZF2 cache
 touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade

From c6c31c5ead287a349e1a19a3f22b891952392511 Mon Sep 17 00:00:00 2001
From: Thomas Metois <thomas@netlor.fr>
Date: Fri, 10 Mar 2017 14:40:13 +0100
Subject: [PATCH 2/2] EVO: script update-all > change text & rm
 composer-setup.php position in script

---
 scripts/update-all.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/update-all.sh b/scripts/update-all.sh
index 36e0f22..e60e363 100755
--- a/scripts/update-all.sh
+++ b/scripts/update-all.sh
@@ -31,12 +31,12 @@ if [[ -z "$composercommand" ]]; then
 		$phpcommand -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 		ACTUAL_SIGNATURE=$($phpcommand -r "echo hash_file('SHA384', 'composer-setup.php');")
 		if [[ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]]; then
-			echo "Error download composer (different hash"
+			echo "Error download composer (different hash)"
 			rm composer-setup.php
 			exit 1
 		fi
-		$phpcommand composer-setup.php --quiet
 		rm composer-setup.php
+		$phpcommand composer-setup.php --quiet
 	fi
 	$phpcommand composer.phar update -o
 else