diff --git a/autodist-cgi b/autodist-cgi index b355a06..3c92e13 100755 --- a/autodist-cgi +++ b/autodist-cgi @@ -61,6 +61,24 @@ if [ "$SHOWLOG" -a "$HOST" != "$AS_HOST" ]; then else for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do + if [ "$SHOWLOG" = "monitor" ]; then + echo "

Build hosts monitor

" + icecream-monitor localhost listcs | \ + while read line; do + [ "${line:0:8}" = "200 done" ] && printon= + if [ "$printon" ]; then + set -- $line + case $2 in + \(*) echo "$line
" ;; + *) echo "$line
" ;; + esac + fi + [ "${line:0:6}" = "listcs" ] && printon=1 + done + echo "
" + RELOADTIME=15000 + break + fi for r in ${AUTOPORT_REPOSITORIES[$i]}; do [ "${AUTOPORT_ARCH[$i]}" ] || continue [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue @@ -82,24 +100,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do else continue fi - if [ "$SHOWLOG" = "monitor" ]; then - echo "

Build hosts monitor

" - icecream-monitor localhost listcs | \ - while read line; do - [ "${line:0:8}" = "200 done" ] && printon= - if [ "$printon" ]; then - set -- $line - case $2 in - \(*) echo "$line
" ;; - *) echo "$line
" ;; - esac - fi - [ "${line:0:6}" = "listcs" ] && printon=1 - done - echo "
" - RELOADTIME=15000 - break - elif [ "$SHOWLOG" ]; then + if [ "$SHOWLOG" ]; then if [ "$HOST" = "$AS_HOST" -a "$NUM" = "$i" ]; then echo "

$SHOWLOG log in $r(${AUTOPORT_ARCH[$i]}):

" cat << _EOF