gembin · September 21, 2021 23:44 · Jul 1, 2013 · Jun 28, 2013
diff --git a/diff2html.sh b/diff2html.sh
@@ -63,7 +63,8 @@ while [[ $? -eq 0 ]]; do
 		lastonly=0
 
 	elif  [[ "$t3" == '+++' ]]; then
-		currFile=${s#+++ */}
+        # --- always comes before +++
+	#	currFile=${s#+++ */}
 		cls='insert'
 		lastonly=0
 

diff --git a/diff2html.sh b/diff2html.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# Convert diff output to colorized HTML.
+# (C) Mitch Frazier, 2008-08-27
+# http://www.linuxjournal.com/content/convert-diff-output-colorized-html
+# Modified by stopyoukid
+#
+
+html="<html><head><meta charset=\"utf-8\"><title>Pretty Diff</title><style>body {text-align: center;}#wrapper {display: inline-block;margin-top: 1em;min-width: 800px;text-align: left;}h2 {background: #fafafa;background: -moz-linear-gradient(#fafafa, #eaeaea);background: -webkit-linear-gradient(#fafafa, #eaeaea);-ms-filter: \"progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa',endColorstr='#eaeaea')\";border: 1px solid #d8d8d8;border-bottom: 0;color: #555;font: 14px sans-serif;overflow: hidden;padding: 10px 6px;text-shadow: 0 1px 0 white;margin: 0;}.file-diff {border: 1px solid #d8d8d8;margin-bottom: 1em;overflow: auto;padding: 0.5em 0;}.file-diff > div {width: 100%:}pre {margin: 0;font-family: \"Bitstream Vera Sans Mono\", Courier, monospace;font-size: 12px;line-height: 1.4em;text-indent: 0.5em;}.file {color: #aaa;}.delete {background-color: #fdd;}.insert {background-color: #dfd;}.info {color: #a0b;}</style></head><body><div id=\"wrapper\">"
+first=1
+diffseen=0
+lastonly=0
+currSection=''
+currFile=''
+
+function addDiffToPage {
+  html+="<h2>"$1"</h2>"
+	html+="<div class=\"file-diff\">"
+	html+=$2
+	html+="</div>"
+}
+
+OIFS=$IFS
+IFS='
+'
+
+# The -r option keeps the backslash from being an escape char.
+read -r s
+
+while [[ $? -eq 0 ]]; do
+	# Get beginning of line to determine what type of diff line it is.
+	t1=${s:0:1}
+	t2=${s:0:2}
+	t3=${s:0:3}
+	t4=${s:0:4}
+	t7=${s:0:7}
+
+	# Determine HTML class to use.
+	if    [[ "$t7" == 'Only in' ]]; then
+		cls='only'
+
+		if [[ $diffseen -eq 0 ]]; then
+			diffseen=1
+		else
+			if [[ $lastonly -eq 0 ]]; then
+                addDiffToPage $currFile $currSection
+			fi
+		fi
+
+		if [[ $lastonly -eq 0 ]]; then
+			currSection=""
+		fi
+		lastonly=1
+
+	elif [[ "$t4" == 'diff' ]]; then
+		cls='file'
+		if [[ $diffseen -eq 1 ]]; then
+            addDiffToPage $currFile $currSection
+		fi
+
+		diffseen=1
+		currSection=""
+		lastonly=0
+
+	elif  [[ "$t3" == '+++' ]]; then
+		currFile=${s#+++ */}
+		cls='insert'
+		lastonly=0
+
+	elif  [[ "$t3" == '---' ]]; then
+		currFile=${s#--- */}
+		cls='delete'
+		lastonly=0
+
+	elif  [[ "$t2" == '@@' ]]; then
+		cls='info'
+		lastonly=0
+
+	elif  [[ "$t1" == '+' ]]; then
+		cls='insert'
+		lastonly=0
+
+	elif  [[ "$t1" == '-' ]]; then
+		cls='delete'
+		lastonly=0
+
+	else
+		cls='context'
+		lastonly=0
+	fi
+
+	# Convert &, <, > to HTML entities.
+	s=$(sed -e 's/\&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' <<<"$s")
+	if [[ $first -eq 1 ]]; then
+		first=0
+	fi
+
+	# Output the line.
+	if [[ "$cls" ]]; then
+		currSection+='<pre class="'${cls}'">'${s}'</pre>'
+	else
+		currSection+='<pre>'${s}'</pre>'
+	fi
+
+	read -r s
+done
+
+#if [[ $diffseen -eq 1  &&  $onlyseen -eq 0 ]]; then 
+if [[ "$currSection" ]]; then
+    addDiffToPage $currFile $currSection
+fi
+html+="</div></body></html>"
+echo "$html"
+
+IFS=$OIFS