From 36d82539295c9f27354a8ff1020e9398d8409b54 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 30 May 2016 20:04:50 +0200 Subject: [PATCH] try to detect if composer binary is called composer.phar or just composer --- .mrconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mrconfig b/.mrconfig index df733d6b16..c16b7e231f 100644 --- a/.mrconfig +++ b/.mrconfig @@ -26,9 +26,9 @@ skip = [ $1 = "tag" -o $1 = "untag" ] [] # to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust checkout = git clone git@github.com:EGroupware/egroupware.git && - /usr/bin/env composer.phar install + /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; - /usr/bin/env composer.phar install + /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install # 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