runtests: Tidy

 - format the base.raw rule more like the other rules
 - drop the `script` bits to simulate a TTY, osi-shell runs things with a
   TTY

1 files changed, 11 insertions, 7 deletions

diff --git a/runtests b/runtests
index cb8e581..706279d 100755
--- a/runtests
+++ b/runtests
@@ -43,9 +43,14 @@ check: ${WORKDIR}/build-$(COMMIT)/pkgdest
 # osi-mk base images ###########################################################
 ${WORKDIR}/base.raw: osi-mk.d/systemd-osi-shell.sh
 ${WORKDIR}/base.raw:
-	rm -f -- '$@'
+	rm -f -- '$@' '$@.tmp'
 	mkdir -p -- '$(@D)'
-	./osi-mk --size=4G --package='base' $(addprefix --module=,$(filter osi-mk.d/%.sh,$^)) '$@'
+	./osi-mk \
+		--size=4G \
+		--package='base' \
+		$(addprefix --module=,$(filter osi-mk.d/%.sh,$^)) \
+		'$@.tmp'
+	mv -T -- '$@.tmp' '$@'
 
 ${WORKDIR}/build.raw: ${WORKDIR}/base.raw
 ${WORKDIR}/build.raw: osi-mk.d/libretools.sh
@@ -61,7 +66,7 @@ ${WORKDIR}/build.raw:
 		su testuser || exit
 		set -e
 		libreblacklist update
-		script --return --quiet --command 'sudo librechroot make' /dev/null
+		sudo librechroot make
 		EOF
 	mv -T -- '$@.tmp' '$@'
 
@@ -87,9 +92,8 @@ ${WORKDIR}/build-232/build.log: %/build.log: %/build.raw
 		su testuser || exit
 		set -e
 		cd ~/packages/abs/systemd
-		# sync on rebuild because the downgrade in [repo] will confuse chcleanup
-		script --return --quiet --command 'sudo librechroot sync' /dev/null
-		script --return --quiet --command 'sudo libremakepkg' /dev/null
+		sudo librechroot sync # on rebuild the downgrade in [repo] will confuse chcleanup
+		sudo libremakepkg
 		EOF
 	mv -T -- '$@.tmp' '$@'
 
@@ -114,7 +118,7 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 		set -e
 		cd ~/packages/abs/systemd
 		sed 's:@COMMIT@:${COMMIT}:' < PKGBUILD.in > PKGBUILD
-		script --return --quiet --command 'sudo libremakepkg' /dev/null
+		sudo libremakepkg
 		EOF
 	mv -T -- '$@.tmp' '$@'