diff options
Diffstat (limited to 'sbo-batch-test')
| -rwxr-xr-x | sbo-batch-test | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sbo-batch-test b/sbo-batch-test index a6ec6b4..051e18f 100755 --- a/sbo-batch-test +++ b/sbo-batch-test @@ -581,10 +581,16 @@ set -uo pipefail cd "$workroot/$prog" || { echo "BUILD-FAILED: cannot cd"; echo BUILD-FAILED > "$workroot/$prog.status"; exit 1; } . ./$prog.info +# Force a controlled output dir so the harness, not the SlackBuild's environment, +# decides where the package lands. Never inherit OUTPUT (the user's -current repo +# convention sets it to /repo, which must not be touched here). +export OUTPUT=/sbo-work/output +mkdir -p "\$OUTPUT" + # Log resolved build context so the overlay never needs to be kept. echo "===== sbo-batch-test: $prog =====" echo "PRGNAM=\${PRGNAM:-$prog} VERSION=\${VERSION:-?} BUILD=\${BUILD:-?} TAG=\${TAG:-?}" -echo "uname -m: \$(uname -m) OUTPUT=\${OUTPUT:-/tmp}" +echo "uname -m: \$(uname -m) OUTPUT=\$OUTPUT" echo "REQUIRES=\${REQUIRES:-}" echo "=================================" @@ -618,8 +624,8 @@ if ! ./$prog.SlackBuild; then echo BUILD-FAILED > "$workroot/$prog.status"; exit 1 fi -# 5. installpkg the resulting package (SlackBuilds write to \${OUTPUT:-/tmp}) -out="\${OUTPUT:-/tmp}" +# 5. installpkg the resulting package (written to the forced OUTPUT above) +out="\$OUTPUT" pkg="\$(ls -t "\$out"/${prog}-*.t?z 2>/dev/null | head -n1)" if [ -z "\$pkg" ]; then echo "No package produced in \$out" |
