Merge 0c8f23e into 18892e6

.travis.yml

@@ -7,19 +7,19 @@ before_script:
   - go get code.google.com/p/go.tools/cmd/cover
   - go get github.com/mattn/goveralls
   - go build -v ./...
-script: go test -v ./...
-after_script:
+script:
+  - go test -v ./...
   - COVERMODE=count
-  - HEADER="mode: $COVERMODE"
+  - HEADER=mode\:\ $COVERMODE
   - COVPARTIAL=profile.cov.out
   - COV=profile-all.cov.out
   - XARGS_ARG=DIR
   - CMD_COV="go test $XARGS_ARG -covermode=$COVERMODE -coverprofile=$XARGS_ARG/$COVPARTIAL"
   - CMD_CHECKDIR="ls $XARGS_ARG/$COVPARTIAL > /dev/null 2>&1"
   - CMD_CONCATCOV="cat $XARGS_ARG/$COVPARTIAL | grep -v '$HEADER' >> $COV"
   - echo $HEADER > $COV
-  - find ./*  -maxdepth 10 -name '*.go' | xargs dirname | uniq | xargs -I$XARGS_ARG sh -c "$CMD_COV && $CMD_CHECKDIR && $CMD_CONCATCOV"
-  - goveralls -coverprofile=$COV -service=travis-ci
+  - find ./*  -maxdepth 10 -name '*.go' -print0 | xargs -r0 -L1 dirname | uniq | xargs -I$XARGS_ARG sh -c "$CMD_COV && $CMD_CHECKDIR && $CMD_CONCATCOV"
+  - $HOME/gopath/bin/goveralls -coverprofile=$COV -service=travis-ci
 notifications:
   email:
     recipients: