diff --git a/CHANGELOG b/CHANGELOG index 339f727..afe7099 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,7 +2,10 @@ 1.7 2016-? - Update to movim 0.9 git2016-03-06 +- Php composer stuff is now shipped in the package - conf/nginx.conf : disable the Yunohost logo +- script/install : comment (disable) php composer stuff +- script/upgrade : comment (disable) php composer stuff 1.6.1 2016-02-12 - Update to movim 0.9 git2016-01-27 diff --git a/scripts/upgrade b/scripts/upgrade index a55af34..8d09f38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,9 +32,10 @@ else fi # Update PHP dependencies -sudo su -c "cd $final_path && rm composer.lock" -sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim -sudo su -c "cd $final_path && php composer.phar install -n" movim +# Not necessary anymore, shipped with movim_ynh +#sudo su -c "cd $final_path && rm composer.lock" +#sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim +#sudo su -c "cd $final_path && php composer.phar install -n" movim # Movim configuration sudo sed -i "s@/ws/@$path/ws/@g" $final_path/app/assets/js/movim_websocket.js