diff options
| author | JF <jf@codingfield.com> | 2021-02-04 16:36:34 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-02-04 16:36:34 (GMT) |
| commit | 3f7360ca186933b600d362c12e7c62d9df509aa4 (patch) | |
| tree | 9e7bff44e541526ae50b183a64cfe1d22a13cc56 /docker | |
| parent | 76ab14fa5f7979dd764b449396dc5835a286ec6d (diff) | |
| parent | 6259b816287f8f74dadf50334a445cd9fe16d415 (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/build.sh b/docker/build.sh index f35c2f3..8f0d0fa 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -31,8 +31,8 @@ main() { CmakeGenerate CmakeBuild $target - - if [[ "$DISABLE_POSTBUILD" != "true" ]]; then + BUILD_RESULT=$? + if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then source "$BUILD_DIR/post_build.sh" fi } @@ -70,7 +70,9 @@ CmakeGenerate() { CmakeBuild() { local target="$1" [[ -n "$target" ]] && target="--target $target" - cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) + if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) + then return 0; else return 1; + fi } [[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
\ No newline at end of file |