Merge branch 'master' of ssh://gitlab.mambasoft.it:4424/openmamba/autodist
This commit is contained in:
commit
70def57d53
@ -376,6 +376,8 @@ if [ "$REQUEST" = "refresh" -o "$REQUEST" = "refreshjobs" ]; then
|
||||
# echo -n "<div align=left class=processes>"
|
||||
u="$(uptime)"
|
||||
f="$(df / -k -h --output=avail,pcent|tail -n1)"
|
||||
fap="$(df /var/autoport/* -k -h --output=avail,pcent|tail -n+2)"
|
||||
[ "$fap" ] && f="$f | ${fap/$'\n'/ | }"
|
||||
b=`ps ax|grep "rpmbuild .*\.spec$"|while read l; do basename "${l/.spec}"; done`
|
||||
echo -n "Load: <b>${u/*: }</b> | Disk: <b>$f</b> | "
|
||||
[ "$b" ] && echo -n "Building now: <b>$b</b> | "
|
||||
@ -1199,10 +1201,10 @@ if [ "$MAINTAINERMODE" = "true" ]; then
|
||||
curl -L -s $REPS_BASE_URL/distromatic/$REPOSITORY/_recent.inc > $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY
|
||||
curl -L -s $REPS_BASE_URL/$REPOSITORY/distromatic.log > $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
|
||||
fi
|
||||
cat $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY | sed "s|a \(href=.\)/|a target=new \1${SITE_BASE_URL}/|g"
|
||||
iconv -c $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY | tr -d '\000-\011\013\014\016-\037' | sed "s|a \(href=.\)/|a target=new \1${SITE_BASE_URL}/|g"
|
||||
|
||||
echo -n "<br><b>Log:</b><br><pre>"
|
||||
cat $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
|
||||
iconv -c $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY | tr -d '\000-\011\013\014\016-\037'
|
||||
echo -n "</pre></div>"
|
||||
echo -n "<input type=button id=updatespecbutton value=\"refresh\" onclick="
|
||||
echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
|
||||
|
Loading…
Reference in New Issue
Block a user