From f8471625af000c6b6bd9fe812bf8ed7e555ba3d2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 12 May 2016 23:02:09 +0200 Subject: [PATCH] adding note to readme to add .mrconfig to ~/.mrtrust and fix .mrconfig to install/update composer dependencies --- .mrconfig | 5 +++-- README.md | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.mrconfig b/.mrconfig index 7416d0a79c..c6c339ab34 100644 --- a/.mrconfig +++ b/.mrconfig @@ -9,9 +9,10 @@ checkout = git clone git@github.com:EGroupware/ADOdb.git [api/js/ckeditor] checkout = svn checkout https://github.com/EGroupware/ckeditor-dev/branches/trunk/dev/builder/release/ckeditor -#[vendor] +[] # to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust -#checkout = composer.phar install +checkout = /usr/bin/env composer.phar install +update = /usr/bin/env composer.phar install ### ### Optional apps you can enable by uncommenting them and (re-)run: mr up diff --git a/README.md b/README.md index add5464c78..f58392f49c 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ * git clone git@github.com:EGroupware/egroupware.git * cd egroupware * # install composer.phar from https://getcomposer.org/download/ -* composer.phar install -* # install myrepos (mr) from https://myrepos.branchable.com/ or your distrbution package +* # install myrepos (mr) from https://myrepos.branchable.com/ or your distribution package manager +* # add a line /path/to/egroupware/.mrconfig to your ~/.mrtrust, to allow running composer.phar and git clone -b 16.1 * mr up * # enable further / non-default EGroupware apps be uncommenting them in .mrconfig and run mr up * continue installation at http://localhost/egroupware/setup/