summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-11-08 08:40:25 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-11-08 08:40:25 -0800
commitfdff8b2aedb751e098241ab7c7d1752de32e80dd (patch)
treea3c508df1ff7196b55c92bba4b4d371f5adc0428
parent92171605156e21d189f4ea01ded6a606ec772e42 (diff)
downloadnasmbuild-fdff8b2aedb751e098241ab7c7d1752de32e80dd.tar.gz
nasmbuild-fdff8b2aedb751e098241ab7c7d1752de32e80dd.tar.xz
nasmbuild-fdff8b2aedb751e098241ab7c7d1752de32e80dd.zip
process_release relied on a variable leak from the build function,
which no longer works since it is run in a subshell. Fix this by making it explicit.
-rwxr-xr-xbuildall.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/buildall.sh b/buildall.sh
index 90796e3..af77568 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -143,17 +143,20 @@ build () {
# This gets run for real (tagged) releases
process_release () {
- rm -rf $web/docs/"$1" $web/xdoc/"$1"
- cp -al "$outdir"/doc/html $web/docs/"$1"
- cp -al "$outdir"/doc $web/xdoc/"$1"
- case "$1" in
+ version="$1"
+ outdir="$2"
+
+ rm -rf $web/docs/"$version" $web/xdoc/"$version"
+ cp -al "$outdir"/doc/html $web/docs/"$version"
+ cp -al "$outdir"/doc $web/xdoc/"$version"
+ case "$version" in
*rc*)
# -rc release
- update_version "$1" $web/version.inc
+ update_version "$version" $web/version.inc
;;
*)
- if update_version "$1" $web/version.inc; then
- ( cd $web && rm -f doc && ln -s docs/"$1" doc )
+ if update_version "$version" $web/version.inc; then
+ ( cd $web && rm -f doc && ln -s docs/"$version" doc )
fi
;;
esac
@@ -196,7 +199,7 @@ fi
err=$?
set -e
if [ $err -eq 0 ]; then
- process_release "$rel_version"
+ process_release "$rel_version" "$reldir"/"$rel_version"
else
# Build failed, we don't want to build this exact tag again
echo "$tagref" > "$excludedir"/"$tag"