diff options
| author | Carl Dong <contact@carldong.me> | 2021-05-25 16:25:30 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-05-25 16:40:46 -0400 |
| commit | d7dec89091ee4a456ff64ad7ce675ae6813668f1 (patch) | |
| tree | e258bc5a1ec98f195b58f90114b5cc23d311940c | |
| parent | 860093401840d7aad7b439aeba0d1598933bc9c6 (diff) | |
guix: Remove dest if OUTDIR mv fails
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 4 | ||||
| -rwxr-xr-x | contrib/guix/libexec/codesign.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 00cb494963..2894a9a695 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -448,4 +448,6 @@ mkdir -p "$DISTSRC" esac ) # $DISTSRC -mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" +rm -rf "$ACTUAL_OUTDIR" +mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \ + || ( rm -rf "$ACTUAL_OUTDIR" && exit 1 ) diff --git a/contrib/guix/libexec/codesign.sh b/contrib/guix/libexec/codesign.sh index 46b42a5712..1822da7ca4 100755 --- a/contrib/guix/libexec/codesign.sh +++ b/contrib/guix/libexec/codesign.sh @@ -100,4 +100,6 @@ mkdir -p "$DISTSRC" esac ) # $DISTSRC -mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" +rm -rf "$ACTUAL_OUTDIR" +mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \ + || ( rm -rf "$ACTUAL_OUTDIR" && exit 1 ) |