# HG changeset patch # User bgruening # Date 1586886961 14400 # Node ID 02dfbbf869d8937181f8733f1aadc09ac117dc88 # Parent 8a18547725cf8547b9432f5bdb3706738dfa87b8 "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit d1ef0f3da4118bf352c5acf720f277fc5ef07665" diff -r 8a18547725cf -r 02dfbbf869d8 diff.xml --- a/diff.xml Tue Mar 31 16:36:28 2020 -0400 +++ b/diff.xml Tue Apr 14 13:56:01 2020 -0400 @@ -1,9 +1,10 @@ - + - analyzes two files and generates a text file with information about the lines that are different + analyzes two files and generates an unidiff text file with information about the differences and an optional Html report diffutils + sed @@ -12,33 +13,49 @@ '$output1' + diff -u '$input1' '$input2' > '$diff_file'; + #if $generate_report: + sed -e 's/@@title@@/Diff report for '$input1.element_identifier' and '$input2.element_identifier'/g' + -e 's/@@outputformat@@/'$output_format'/g' + -e '/@@diffoutput@@/{r'$diff_file'' -e ';d}' + '$__tool_directory__/template.html' > '$html_file' + #end if ]]> + + + + + - + + + generate_report is True + - + - + + - + - + + @@ -46,6 +63,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87,5 +140,23 @@ url = {http://www.gnu.org/software/diffutils/}, } + + @misc{diff2html, + author = {Rodrigo Fernandes}, + year = {2014}, + title = {Pretty diff to html javascript library (diff2html)}, + publisher = {Github}, + url = {https://github.com/rtfpessoa/diff2html}, + } + + + @misc{sed, + author = {The Free Software Foundation (FSF), Inc}, + year = {2017}, + title = {sed (GNU sed)}, + publisher = {The Free Software Foundation (FSF), Inc}, + url = {http://www.gnu.org/software/sed/}, + } + diff -r 8a18547725cf -r 02dfbbf869d8 template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/template.html Tue Apr 14 13:56:01 2020 -0400 @@ -0,0 +1,524 @@ + + + + + @@title@@ + + + + + + + + + + + + + + +
+

@@title@@

+
+ +
+ + + + + + + \ No newline at end of file