suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yet more tweaks and fixes.

Browse Source
This commit is contained in:
Eli Barzilay 2012-01-08 12:58:33 -05:00
parent 95ac3c86f7
commit 86579b4f15
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collects/meta/build/build
View File

@ -1056,7 +1056,7 @@ MAIN_BUILD() {
fi fi
if is_yes make_bins; then if is_yes make_bins; then
header "Creating archive" header -s "Creating archive"
_cd "$maindir" _cd "$maindir"
_rm "$repotgz" _rm "$repotgz"
_cd "$maindir/$cleandir" _cd "$maindir/$cleandir"
@ -2186,9 +2186,11 @@ BUILD_PRE_WEB() {
local target="$maindir/$prewebdir/$(basename "$statusscript")" local target="$maindir/$prewebdir/$(basename "$statusscript")"
{ {
echo "#!/bin/bash" echo "#!/bin/bash"
local v echo ""
for v in tmpdir lockfile statusfile statusfile_last bglogfile; do local var
echo "$v=$(eval "\$$var")" for var in tmpdir lockfile statusfile statusfile_last bglogfile; do
local val; eval val="\$$var"
echo "$var=\$$val"
done done
echo "" echo ""
cat "$PLTHOME/$statusscript" cat "$PLTHOME/$statusscript"

2
collects/meta/build/current-build-status.cgi
View File

@ -7,7 +7,7 @@ printf 'Content-type: text/plain\r\n\r\n'
# cache status reports (avoids excessive work during builds) # cache status reports (avoids excessive work during builds)
# use a lockfile as a cheap hack to time cache refreshing # use a lockfile as a cheap hack to time cache refreshing
if ! lockfile -r 0 -l 5 -s 0 "$cachelock" >& /dev/null \ if ! lockfile -r 0 -l 30 -s 0 "$cachelock" >& /dev/null \
&& [[ -e "$cache" ]]; then && [[ -e "$cache" ]]; then
cat "$cache"; exit cat "$cache"; exit
fi fi