github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-12-18 03:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix grep portability (Reported-by: Andrew Thompson)

Browse source
This commit is contained in:
Tuncer Ayaz 2011-07-13 20:22:03 +02:00
parent 12b26fab32
commit 4e0ab4065f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
priv/templates/simplenode.runner
View file

@ -23,14 +23,14 @@ cd $RUNNER_BASE_DIR
mkdir -p $RUNNER_LOG_DIR mkdir -p $RUNNER_LOG_DIR
# Extract the target node name from node.args # Extract the target node name from node.args
NAME_ARG=`egrep -e '^-s?name' $RUNNER_ETC_DIR/vm.args` NAME_ARG=`egrep '^-s?name' $RUNNER_ETC_DIR/vm.args`
if [ -z "$NAME_ARG" ]; then if [ -z "$NAME_ARG" ]; then
echo "vm.args needs to have either -name or -sname parameter." echo "vm.args needs to have either -name or -sname parameter."
exit 1 exit 1
fi fi
# Extract the target cookie # Extract the target cookie
COOKIE_ARG=`grep -e '^-setcookie' $RUNNER_ETC_DIR/vm.args` COOKIE_ARG=`grep '^-setcookie' $RUNNER_ETC_DIR/vm.args`
if [ -z "$COOKIE_ARG" ]; then if [ -z "$COOKIE_ARG" ]; then
echo "vm.args needs to have a -setcookie parameter." echo "vm.args needs to have a -setcookie parameter."
exit 1 exit 1

2
src/rebar_ct.erl
View file

@ -90,7 +90,7 @@ clear_log(RawLog) ->
%% log results %% log results
check_log(RawLog) -> check_log(RawLog) ->
{ok, Msg} = {ok, Msg} =
rebar_utils:sh("grep -e 'TEST COMPLETE' -e '{error,make_failed}' " rebar_utils:sh("egrep -e 'TEST COMPLETE' -e '{error,make_failed}' "
++ RawLog, [{use_stdout, false}]), ++ RawLog, [{use_stdout, false}]),
MakeFailed = string:str(Msg, "{error,make_failed}") =/= 0, MakeFailed = string:str(Msg, "{error,make_failed}") =/= 0,
RunFailed = string:str(Msg, ", 0 failed") =:= 0, RunFailed = string:str(Msg, ", 0 failed") =:= 0,