Skip to content
Snippets Groups Projects
Commit bc7a52bb authored by David Byers's avatar David Byers
Browse files

Correct error in build.sh

parent 1b59faaf
Branches
Tags 1.5.1.22
1 merge request!8Beta
Pipeline #33519 passed
Stage: prepare
Stage: collect
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
scripts/build.sh
+ 1
− 1
View file @ bc7a52bb
...@@ -121,7 +121,7 @@ for target in "${TARGETS[@]}" ; do ...@@ -121,7 +121,7 @@ for target in "${TARGETS[@]}" ; do
merge+=("$origdir/manifest.merge.json") merge+=("$origdir/manifest.merge.json")
[ "$beta" -a -f "$sourcedir/manifest.beta.merge.json" ] && \ [ "$beta" -a -f "$sourcedir/manifest.beta.merge.json" ] && \
merge+=("$sourcedir/manifest.beta.merge.json") merge+=("$sourcedir/manifest.beta.merge.json")
[ "$origdir" -a "$beta" -a -f "$sourcedir/manifest.beta.merge.json" ] && \ [ "$origdir" -a "$beta" -a -f "$origdir/manifest.beta.merge.json" ] && \
merge+=("$origdir/manifest.beta.merge.json") merge+=("$origdir/manifest.beta.merge.json")
override=() override=()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment