Skip to content

Commit

Permalink
Refactor travis.sh with newline in if block (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
wkentaro authored and k-okada committed Aug 7, 2016
1 parent 423fd91 commit 7e8ec98
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ function error {
trap error ERR

git branch --all
if [ "`git diff origin/master FETCH_HEAD .travis`" != "" ] ; then DIFF=`git diff origin/master FETCH_HEAD .travis | grep .*Subproject | sed s'@.*Subproject commit @@' | sed 'N;s/\n/.../'`; (cd .travis/;git log --oneline --graph --left-right --first-parent --decorate $DIFF) | tee /tmp/$$-travis-diff.log; grep -c '<' /tmp/$$-travis-diff.log && exit 1; echo "ok"; fi
if [ "`git diff origin/master FETCH_HEAD .travis`" != "" ] ; then
DIFF=`git diff origin/master FETCH_HEAD .travis | grep .*Subproject | sed s'@.*Subproject commit @@' | sed 'N;s/\n/.../'`;
(cd .travis/;git log --oneline --graph --left-right --first-parent --decorate $DIFF) | tee /tmp/$$-travis-diff.log;
grep -c '<' /tmp/$$-travis-diff.log && exit 1;
echo "ok";
fi


travis_time_start setup_ros
Expand Down

0 comments on commit 7e8ec98

Please sign in to comment.