From 02d57eb3cef7fe86b12c744769504d716af7b420 Mon Sep 17 00:00:00 2001 From: Xavier ROOT Date: Fri, 13 Nov 2015 15:44:16 +0100 Subject: [PATCH] fix#11 (upgrade db, quiet composer upgrade) --- scripts/install | 3 ++- scripts/upgrade | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d4afd69..81a33bc 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,8 @@ sudo chmod -R 750 $final_path # Install PHP dependencies sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" movim -sudo su -c "cd $final_path && php composer.phar install" movim +sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim # auto yes +sudo su -c "cd $final_path && php composer.phar install -n" movim # install + quiet mode # Movim configuration sudo sed -i "s@'username' => 'username'@'username' => '$db_user'@g" $final_path/config/db.inc.php diff --git a/scripts/upgrade b/scripts/upgrade index 4e65a3d..45e66b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,11 +30,15 @@ else fi # Update PHP dependencies -sudo su -c "cd $final_path && php composer.phar update" movim +sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim # auto y +sudo su -c "cd $final_path && php composer.phar update -n" movim # upgrade + quiet # Movim configuration sudo sed -i "s@/ws/@$path/ws/@g" $final_path/app/assets/js/movim_websocket.js +# Upgrade db if necessary +sudo su -c "cd $final_path && php mud.php db set" movim + # Update xmppwhitelist if private if [ $public_site = "No" ]; then