diff options
author | 2016-04-20 23:08:35 +0200 | |
---|---|---|
committer | 2016-05-02 14:33:33 +0000 | |
commit | 162ce350ac528a9c7cb726debe89370b9d1bed35 (patch) | |
tree | 5e97a91c3ceee16296cb2b6d5cb131b26e92a6cf /ci/build.sh | |
parent | d40f475f76712c9dad07fa0bfb98f02e4191c464 (diff) |
build.sh: do not use readlink for unexisting dir
The build failed to copy the artifact files to the destination
directory because the variable BUILD_DIRECTORY was empty.
This variable is obtained doing "readlink" on a path, although
at the time of the assignment that path does not exist yet. This
is because it depends on a path inside a submodule that has not
yet been initialized.
We remove readlink on the assignment since we know the path will
already be in a canonicalized form, since it is constructed from
an already canonicalized path.
Change-Id: Icc1113d26b503ff998aebbcd1efe81004859f878
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit d7adccfac3b55fdac91554ebbef83cf68ccfaf5a)
Diffstat (limited to 'ci/build.sh')
-rwxr-xr-x | ci/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build.sh b/ci/build.sh index 256f8284..98078b0a 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -23,7 +23,7 @@ echo "Building armband, output dir: $OUTPUT_DIR" cd .. SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})) -BUILD_BASE=$(readlink -e ${SCRIPT_DIR}/upstream/fuel/build/) +BUILD_BASE="${SCRIPT_DIR}/upstream/fuel/build/" RESULT_DIR="${BUILD_BASE}/release" make release || error_exit "Make release failed" |