carbon-s6-init

commit 51c4b10fa1b1e2f71ed02d15b6b45fabcd4dcc2d
parent bc1ee0ae9bef71dc33033c847cad4a0198931d71
Author: ccx <root@dorje.wpr.cz>
Date:   Mon, 29 Mar 2021 19:47:23 +0200

Simplify error checking.

Diffstat:
M
install
 | 
10
+++-------

1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/install b/install
@@ -1,6 +1,4 @@
 #!/bin/sh
-set -x
-set -e
 
 test -d "$1" || exit 1
 dst=$1
@@ -22,7 +20,7 @@ q_package=$(q "$sm_dst_package") || exit $?
 qc=$q_package/command
 
 # Generate init
-"$sm_dst_package/command/s6-linux-init-maker" \
+"$cmd/s6-linux-init-maker" \
 	-p "/command:/usr/local/bin:/usr/bin:/bin" \
 	-G "/usr/bin/env TERM=linux /sbin/getty 38400 tty9" \
 	-t 1 \
@@ -31,15 +29,14 @@ qc=$q_package/command
 	"$dst/init" || exit $?
 
 # Rewrite dynamically generated scripts
-"$cmd/s6-cat" >"$dst/init/scripts/rc.init" <<EOF
+"$cmd/s6-cat" >"$dst/init/scripts/rc.init" <<EOF || exit $?
 #!$sm_dst_package/command/execline -S1
 export TERM "linux"
 if { $qc/s6-rc-init -d -c $q_s6_rc/compiled /run/service }
 $q_init/scripts/runlevel \$1
 EOF
-r=$?; if test 0 -ne $r; then exit $r; fi
 
-"$cmd/s6-cat" >"$dst/init/scripts/runlevel" <<EOF
+"$cmd/s6-cat" >"$dst/init/scripts/runlevel" <<EOF || exit $?
 #!$sm_dst_package/command/execline -S1
 export TERM "linux"
 
@@ -59,4 +56,3 @@ ifelse -X {
 foreground { $qc/s6-rc -v 2 -t 600000 -- change ok-all-but-tty }
 $qc/s6-rc -v 2 -t 600000 -- change ok-all
 EOF
-r=$?; if test 0 -ne $r; then exit $r; fi