diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-30 02:46:30 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-30 02:46:30 (EDT) |
| commit | 72f1bbe9f1bb82d3b340eea50924529942c93ace (patch) | |
| tree | ce6e405c9202fb083d647d08e06f0e2d9052a0f9 /src | |
| parent | b6626e0e23ee817383e29fc1f2428bca169a20db (diff) | |
opkbuild: Run ob-* commands from a child shell
This basically reverts commit ab654dadd640164b7ddf01a3599c2a8beb6d6302.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opkbuild.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/opkbuild.sh b/src/opkbuild.sh index e6dc730..ab768eb 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -351,13 +351,16 @@ build() { case "${opt_target}" in '') - ../build build && - ${opt_uid0_cmd} -- ../build install && - ${opt_uid0_cmd} -- "${bindir}/ob-installdocs" && - ${opt_uid0_cmd} -- "${bindir}/ob-gencontrol" && - ${opt_uid0_cmd} -- "${bindir}/ob-buildopk" && - ${opt_uid0_cmd} -- "${bindir}/ob-genchanges" || + if ! ../build build || ! ${opt_uid0_cmd} -- ${SH} <<-EOF + ../build install && + "${bindir}/ob-installdocs" && + "${bindir}/ob-gencontrol" && + "${bindir}/ob-buildopk" && + "${bindir}/ob-genchanges" + EOF + then return 1 + fi ;; 'install'|'install-'*) if ! ${opt_uid0_cmd} -- ../build -- "${opt_target}" |