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

Correct error in build.sh

parent 2f519f57
Branches
Tags 1.5.1.21
1 merge request!8Beta
Pipeline #33518 failed
...@@ -119,17 +119,17 @@ for target in "${TARGETS[@]}" ; do ...@@ -119,17 +119,17 @@ for target in "${TARGETS[@]}" ; do
merge+=("$sourcedir/manifest.merge.json") merge+=("$sourcedir/manifest.merge.json")
[ "$origdir" -a -f "$origdir/manifest.merge.json" ] && \ [ "$origdir" -a -f "$origdir/manifest.merge.json" ] && \
merge+=("$origdir/manifest.merge.json") merge+=("$origdir/manifest.merge.json")
[ "$beta" -a "$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 "$sourcedir/manifest.beta.merge.json" ] && \ [ "$origdir" -a "$beta" -a -f "$sourcedir/manifest.beta.merge.json" ] && \
merge+=("$origdir/manifest.beta.merge.json") merge+=("$origdir/manifest.beta.merge.json")
override=() override=()
[ "$origdir" -a -f "$origdir/manifest.override.json" ] && \ [ "$origdir" -a -f "$origdir/manifest.override.json" ] && \
override+=("$origdir/manifest.override.json") override+=("$origdir/manifest.override.json")
[ "$beta" -a "$sourcedir/manifest.beta.override.json" ] && \ [ "$beta" -a -f "$sourcedir/manifest.beta.override.json" ] && \
override+=("$sourcedir/manifest.beta.override.json") override+=("$sourcedir/manifest.beta.override.json")
[ "$origdir" -a "$beta" -a "$origdir/manifest.beta.override.json" ] && \ [ "$origdir" -a "$beta" -a -f "$origdir/manifest.beta.override.json" ] && \
override+=("$origdir/manifest.beta.override.json") override+=("$origdir/manifest.beta.override.json")
python3 "$BASEDIR/scripts/makemanifest.py" \ python3 "$BASEDIR/scripts/makemanifest.py" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment