Skip to content

Commit 0eb1575

Browse files
committed
Build setup fixes.
1 parent 3b4fcc1 commit 0eb1575

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
2.7.0 (2018-07-18)
1+
2.7.0 (2018-07-19)
22
------------------
33

44
New features:
55

66
* `ARGBASH_WRAP` works recursively - you can wrap wrapped scripts.
7+
* Introduced new output - the strict POSIX shell output.
78

89
Bugfixes:
910

doc/Makefile.pieces

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AB_INIT = ../bin/argbash-init
77
# example exclusively in index.rst
88
INDEX_SCRIPT = script.sh
99
MINIMAL_INIT_TPL = $(RESOURCES)/examples/minimal-raw.m4
10+
MINIMAL_INIT_CREATE = minimal.m4
1011
MINIMAL_INIT_POST = $(RESOURCES)/examples/minimal.m4
1112
MINIMAL_SCRIPT = $(RESOURCES)/examples/minimal.sh
1213
SIMPLE = $(RESOURCES)/examples/simple.sh
@@ -47,9 +48,8 @@ endef
4748

4849
A_INIT_ARGS = --pos positional-arg --opt option --opt-bool print
4950
$(STATICDIR)/minimal_init-create.txt: $(AB_INIT)
50-
$(eval FLAGS := $(A_INIT_ARGS) minimal.m4)
51+
$(eval FLAGS := $(A_INIT_ARGS) $(MINIMAL_INIT_CREATE))
5152
$(CMD_OUT)
52-
$(RM) minimal.m4
5353

5454
$(STATICDIR)/index_script-create.txt: $(AB_INIT) $(INDEX_SCRIPT)
5555
$(eval FLAGS := $(A_INIT_ARGS) - | $(AB) -o $(INDEX_SCRIPT) -)
@@ -70,7 +70,7 @@ $(MINIMAL_INIT_TPL): $(AB_INIT)
7070
$(AB_INIT) $(A_INIT_ARGS) $@
7171

7272
$(MINIMAL_INIT_POST): $(MINIMAL_INIT_TPL) $(PWD)/_static/minimal.patch
73-
cat $(word 2,$^) | sed -e 's/@VERSION@/$(shell cat ../src/version)/' | patch -d $(dir $<) -o $(notdir $@) $(notdir $<)
73+
cat $(word 2,$^) | sed -e 's/@VERSION@/$(shell cat ../src/version)/' | patch -d $(dir $@) -o $(notdir $@) $(notdir $<)
7474

7575
# We enable the comments-in mode for the minimal script, so they are can be observed in the documentation
7676
$(MINIMAL_SCRIPT): $(MINIMAL_INIT_POST) $(AB)
@@ -79,7 +79,6 @@ $(MINIMAL_SCRIPT): $(MINIMAL_INIT_POST) $(AB)
7979
$(STATICDIR)/minimal_argbash-create.txt: $(AB) $(MINIMAL_INIT_POST)
8080
$(eval FLAGS := -o $(MINIMAL_SCRIPT) $(MINIMAL_INIT_POST))
8181
$(CMD_OUT_LOCAL)
82-
rm $(MINIMAL_SCRIPT)
8382

8483
$(STATICDIR)/minimal_init-output.txt: $(MINIMAL_SCRIPT)
8584
$(eval FLAGS := --option value1 --print value0)
@@ -113,4 +112,4 @@ clean-pieces: clean-tmp
113112
$(RM) $(PIECES)
114113

115114
clean-tmp:
116-
$(RM) $(MINIMAL_SCRIPT) $(INDEX_SCRIPT) $(MINIMAL_INIT_POST)
115+
$(RM) $(MINIMAL_SCRIPT) $(INDEX_SCRIPT) $(MINIMAL_INIT_CREATE)

0 commit comments

Comments
 (0)