Skip to content

Commit 85ace14

Browse files
committed
Meta/Dothem: --dash option builds only with dash
Earlier one tried to build with /bin/sh and /bin/dash but to do so correctly we need to 'make clean' in the middle, which is too much overhead to do many times a day.
1 parent 96d720e commit 85ace14

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Dothem

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,13 @@ do
148148

149149
save=$(git rev-parse HEAD) &&
150150

151-
{
152-
test "z$with_dash" != 'zy' ||
153-
Meta/Make $M ${test+"$test"} -- $jobs SHELL_PATH=/bin/dash $dotest
154-
} &&
155-
156-
Meta/Make $M ${test+"$test"} -- $jobs $dotest &&
151+
Meta/Make $M ${test+"$test"} $jobs -- ${with_dash:+SHELL_PATH=/bin/dash} $dotest &&
157152

158153
{
159154
test -n "$nodoc" ||
160155
if test "$save" = "$(git rev-parse HEAD)"
161156
then
162-
Meta/Make $M -- $jobs doc &&
157+
Meta/Make $M $jobs -- doc &&
163158
Meta/Make $M -- install-man install-html
164159
else
165160
echo >&2 "Head moved--not installing docs"
@@ -177,6 +172,6 @@ do
177172
} || exit $?
178173

179174
git reset --hard
180-
) || break;
175+
) </dev/null || exit $?
181176

182177
done

0 commit comments

Comments
 (0)