Commit a4538bc61c0b74d368661193cd1577c25fad1c26

Thomas de Grivel 2023-02-14T18:45:42

br

diff --git a/bin/ansi2html b/bin/ansi2html
index aa2b50d..019da3e 100755
--- a/bin/ansi2html
+++ b/bin/ansi2html
@@ -7,8 +7,8 @@ ansi2html_sed () {
         -e 's|>|>|g' \
         -e "s|$(printf '\33\\[0;34m')|<span style=\"color: blue;\">|g" \
         -e "s|$(printf '\33\\[0;35m')|<span style=\"color: purple;\">|g" \
-        -e "s|$(printf '\33\\[0m')|</span>|g" \
-        -e 's|$|<br/>|'
+        -e "s|$(printf '\33\\[0m')|</span>|g"
+#        -e 's|$|<br/>|'
 }
 
 if [ $# -gt 0 ]; then
diff --git a/bin/shpkg_ci b/bin/shpkg_ci
index 3ff0e94..db0676a 100755
--- a/bin/shpkg_ci
+++ b/bin/shpkg_ci
@@ -44,11 +44,11 @@ EOF
         echo "$1" | ansi2html
         cat <<EOF
 </h1>
-    <code>
+    <pre><code>
 EOF
         ansi2html < "$1"
         cat <<EOF
-</code>
+</code></pre>
     <div class="footer">
       <a href="https://git.kmx.io/kmx.io/shpkg">shpkg_ci</a>
     </div>
@@ -61,7 +61,7 @@ EOF
 
 logs2html () {
     for F in "${SHPKG_CI_LOG_DIR}"/"${SHPKG_REPO}".*.log; do
-        if ! [ -f "$F.html" ] || [ "$F" -nt "$F.html" ]; then
+        if ! [ -f "$F.html" ] || [ "$F" -nt "$F.html" ] || [ "$0" -nt "$F.html" ]; then
             verbose 2 log2html "$F"
         fi
     done