Skip to content

Commit

Permalink
Address milo's pull request comments. Fixes bazaarvoice#18. Fixes baz…
Browse files Browse the repository at this point in the history
  • Loading branch information
snkinard committed Jul 2, 2013
1 parent db930d2 commit 3f2d915
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/diffy
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

java -jar $DIR/../tools/target/jolt-tools-0.0.6-SNAPSHOT.jar $@
java -jar $DIR/../tools/target/jolt-tools-*-SNAPSHOT.jar $@
4 changes: 2 additions & 2 deletions tools/src/main/java/com/bazaarvoice/jolt/DiffyTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ public static void main( String[] args ) {
System.exit( 0 );
} else {
try {
printOutput( suppressOutput, "A difference was found. Input #1 contained this:\n" +
printOutput( suppressOutput, "Differences found. Input #1 contained this:\n" +
JsonUtils.toPrettyJsonString( result.expected ) + "\n" +
"Input #2 contained this:\n" +
JsonUtils.toPrettyJsonString( result.actual ) );
} catch ( IOException e ) {
printOutput( suppressOutput, "A difference was found, but diffy encountered an error while writing the result." );
printOutput( suppressOutput, "Differences found, but diffy encountered an error while writing the result." );
} finally {
System.exit( 1 );
}
Expand Down

0 comments on commit 3f2d915

Please sign in to comment.