Skip to content

Commit eff5e8f

Browse files
committed
Remove ONESHELL stuff
1 parent e0651d3 commit eff5e8f

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

Makefile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ FORK_CHOICE_DIR = ./fork_choice
2828
# To check generator matching:
2929
#$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}])
3030

31+
MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
32+
$(wildcard $(SPEC_DIR)/*/*/*.md) \
33+
$(wildcard $(SPEC_DIR)/_features/*/*.md) \
34+
$(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
35+
$(wildcard $(SSZ_DIR)/*.md)
36+
3137
ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800 eip7732
3238
# The parameters for commands. Use `foreach` to avoid listing specs again.
3339
COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
@@ -135,26 +141,15 @@ endif
135141
open_cov:
136142
((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &
137143

138-
# When using .ONESHELL, bail on errors.
139-
.SHELLFLAGS = -e
140-
141-
# This contains all markdown files that should have table of contents.
142-
MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
143-
$(wildcard $(SPEC_DIR)/*/*/*.md) \
144-
$(wildcard $(SPEC_DIR)/_features/*/*.md) \
145-
$(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
146-
$(wildcard $(SSZ_DIR)/*.md)
147-
148144
# Check all files and error if any ToC were modified.
149145
check_toc: $(MARKDOWN_FILES:=.toc)
150146
@[ "$$(find . -name '*.md.tmp' -print -quit)" ] && exit 1 || exit 0
151147

152148
# Generate ToC sections & save copy of original if modified.
153-
.ONESHELL:
154149
%.toc:
155-
@cp $* $*.tmp
156-
@doctoc $* > /dev/null
157-
@if diff -q $* $*.tmp > /dev/null; then \
150+
@cp $* $*.tmp; \
151+
doctoc $* > /dev/null; \
152+
if diff -q $* $*.tmp > /dev/null; then \
158153
echo "Good $*"; \
159154
rm $*.tmp; \
160155
else \

0 commit comments

Comments
 (0)