Skip to content

Commit d7dec89

Browse files
committed
guix: Remove dest if OUTDIR mv fails
1 parent 8600934 commit d7dec89

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

contrib/guix/libexec/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,4 +448,6 @@ mkdir -p "$DISTSRC"
448448
esac
449449
) # $DISTSRC
450450

451-
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR"
451+
rm -rf "$ACTUAL_OUTDIR"
452+
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
453+
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )

contrib/guix/libexec/codesign.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,6 @@ mkdir -p "$DISTSRC"
100100
esac
101101
) # $DISTSRC
102102

103-
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR"
103+
rm -rf "$ACTUAL_OUTDIR"
104+
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
105+
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )

0 commit comments

Comments
 (0)