From 43930a028bc2d5f2c6a58ea08c28d72dcf734838 Mon Sep 17 00:00:00 2001
From: Jordan Morin <jordan@e-declic.com>
Date: Tue, 21 Nov 2017 14:57:00 +0100
Subject: [PATCH] fix : command dans le container non en local

---
 install.sh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index dd15e75..04f5a38 100644
--- a/install.sh
+++ b/install.sh
@@ -105,8 +105,8 @@ then
   cd ../conf
   git clone http://code.e-declic.net:3000/jmorin/conf-magento2.git
   sudo mv conf-magento2/* .
-  sed -i "s/urlsite/$urlsite/g" *.conf
-  sed -i "s/nomdusite/$nomdusite/g" *.conf
+  sed -i -e "s/urlsite/$urlsite/g" *.conf
+  sed -i -e "s/nomdusite/$nomdusite/g" *.conf
   if [ $installMagento = "local" ];
   then
     read -p "Emplacement du fichier conf ? (avec / à la fin)" emplacementConf
@@ -129,26 +129,23 @@ then
       ln -s local.conf $emplacementConf$nomdusite.conf
     fi 
   fi 
-  sed -i "s/fastcgi_backend/$fastcgiPass/g" ../www/nginx.conf.sample
+  sed -i -e "s/fastcgi_backend/$fastcgiPass/g" ../www/nginx.conf.sample
 
   cd ../www
-  chgrp -Rin www-data ./*
-  chmod -R 770 var 
-  chmod -R 770 generation
-  chmod -R 771 pub 
-  rm -rf var/di/* var/generation/*
-  php bin/magento deploy:mode:set developer
-  php bin/magento module:disable Quickshiftin_Assetorderer
+  if [ $hostBDD = "localhost" ];
+  then
+    sudo -s -- 'chgrp -R www-data ./*;chmod -R 770 var generation;chmod -R 771 pub;rm -rf var/di/* var/generation/*;php bin/magento deploy:mode:set developer;php bin/magento module:disable Quickshiftin_Assetorderer;php bin/magento setup:static-content:deploy -f fr_FR;php bin/magento setup:static-content:deploy -f en_US;chmod -R 775 pub'
+  else
+    docker exec -it $dockerPhp bash -c "cd /home/www/$nomdusite/www;chgrp -R www-data ./*;chmod -R 770 var generation;chmod -R 771 pub;rm -rf var/di/* var/generation/*;php bin/magento deploy:mode:set developer;php bin/magento module:disable Quickshiftin_Assetorderer;php bin/magento setup:static-content:deploy -f fr_FR;php bin/magento setup:static-content:deploy -f en_US;chmod -R 775 pub"
+  fi
   
   if [ $hostBDD = "localhost" ];
   then
     /Applications/MAMP/Library/bin/mysql -u $identifiantBDD --password=$mdpBDD -e "use $nombase;insert core_config_data (config_id, scope, scope_id, path, value) values (null, 'default', 0, 'dev/static/sign', 0);"
   else
-    docker exec -i $hostBDD bash -c "mysql -u $identifiantBDD --password=$mdpBDD -e 'use $nombase;insert core_config_data (config_id, scope, scope_id, path, value) values (null, 'default', 0, 'dev/static/sign', 0);'"
+    docker exec -i $hostBDD bash -c "mysql -u $identifiantBDD --password=$mdpBDD -e 'use $nombase;insert core_config_data (config_id, scope, scope_id, path, value) values (null, \'default\', 0, \'dev/static/sign\', 0);'"
   fi
   
-  
-  
   if [ $installMagento = "local" ];
   then 
     sudo -- sh -c -e "echo 'localhost $url' >> /etc/hosts";