diff --git a/.mrconfig b/.mrconfig index fd9303635b..46a3f4809b 100644 --- a/.mrconfig +++ b/.mrconfig @@ -22,8 +22,8 @@ checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.u checkout = git clone git@github.com:EGroupware/egroupware.git && /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true; - rm -rf api/js/ckeditor; - /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install + /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install; + rm -rf api/js/ckeditor; ln -s ../../vendor/egroupware/ckeditor api/js/ # uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli #post_checkout = /usr/bin/env npm install && /usr/bin/env grunt #post_update = /usr/bin/env npm install && /usr/bin/env grunt