From 1b59faaf4c89c9c40740fd0c51d83226d433e654 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Thu, 11 Feb 2021 12:09:35 +0100
Subject: [PATCH] Correct error in build.sh
---
scripts/build.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index b2c75cd..c786ed4 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -119,17 +119,17 @@ for target in "${TARGETS[@]}" ; do
merge+=("$sourcedir/manifest.merge.json")
[ "$origdir" -a -f "$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")
- [ "$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")
override=()
[ "$origdir" -a -f "$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")
- [ "$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")
python3 "$BASEDIR/scripts/makemanifest.py" \
--
GitLab