diff --git a/autodist-cgi b/autodist-cgi index 21cfdff..a8d3fe2 100755 --- a/autodist-cgi +++ b/autodist-cgi @@ -145,9 +145,8 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do [ "${SHOWLOG}" = "current" -o "${SHOWLOG}" = "last" -a ! "${AUTOPORT_UPDATE[$i]}" ] && echo -n " ($r)" echo -n ":" cat << _EOF -
-
- +
+
_EOF echo -n "
"
          if [ "$SHOWLOG" = "current" ]; then
@@ -215,8 +214,8 @@ _EOF
          echo " [ last ]"
       fi
       cat << _EOF
-      
-
+
+
_EOF echo -n "
"
       unset BUILDNOWIDX BUILDLOG BUILDNOW BUILDNOWSTATUS SCHEDULED STARTTIME AUTODIST_PID ENDTIME
diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi
index 6792550..e72d317 100755
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@@ -1658,7 +1658,7 @@ if [ "$REQUEST" != "" ]; then
    echo -n "Console output ($REQUEST"
    [ "$PACKAGE" ] && echo -n " for $PACKAGE"
    echo -n "):"
-   echo -n "
\1|; s|\(ftp[s]*://[[:alnum:]+\,:&?/_.=~%#-]*\)|\1|; s|\(http[s]*://[[:alnum:]+\,:&?/_.=~%#-]*\)|\1|; - s|\(.*\)\(error[^0-9A-Za-z]*:[[:space:]]*.*\)|\1\2|i; - s|^\(== =.*\)|\1|; + s|\(.*\)\(error[^0-9A-Za-z]*:[[:space:]]*.*\)|\1\2|i; + s|^\(== =.*\)|\1|; s|^[[:cntrl:]]*\([!%?=][!%!=>] .*\)|\1|; s|[[:cntrl:]]||g;" | google_search $1 } diff --git a/webbuild/webbuild-functions-private b/webbuild/webbuild-functions-private index cf77eb8..b67e19f 100644 --- a/webbuild/webbuild-functions-private +++ b/webbuild/webbuild-functions-private @@ -42,7 +42,7 @@ function showlog() { LOGFILES=`$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "ls -t $LOGFILES 2>/dev/null | head -1"` fi echo -n "Console output for $PACKAGE ($LOGTYPE$LOGSTATUSAPPEND):" - echo "
" + echo "
" for f in $LOGFILES; do if [ -r $f ]; then LOGFILESIZE=`stat -c %s $f`