summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2015-10-21 16:34:08 -0700
committerHolger Levsen <holger@layer-acht.org>2015-10-21 19:40:14 -0500
commitccf4dee56e1c2ea7b1277919aca087728db762d0 (patch)
tree3aa4130f665dbdd81644873eca24dad9fd99c31e
parent870aa702c772689f1b72470d1d347ed8ab5473a2 (diff)
downloadjenkins.debian.net-ccf4dee56e1c2ea7b1277919aca087728db762d0.tar.xz
openwrt: use hard (-f) rm to clear temporary files
This fixes some hangs and bugs I ran in to while testing.
-rwxr-xr-xbin/reproducible_openwrt.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 15fd2d3b..af092519 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -14,8 +14,8 @@ set -e
cleanup_tmpdirs() {
cd
- rm -r $TMPDIR
- rm -r $TMPBUILDDIR
+ rm -rf $TMPDIR
+ rm -rf $TMPBUILDDIR
}
create_results_dirs() {
@@ -88,9 +88,9 @@ openwrt_build() {
}
openwrt_cleanup() {
- rm build_dir/target-* -r
- rm staging_dir/target-* -r
- rm bin/* -r
+ rm build_dir/target-* -rf
+ rm staging_dir/target-* -rf
+ rm bin/* -rf
}
build_two_times() {
@@ -199,7 +199,7 @@ BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
cat $(find build_dir/ -name banner | grep etc/banner|head -1) >> $BANNER_HTML
# clean up builddir to save space on tmpfs
-rm -r $TMPBUILDDIR/openwrt
+rm -rf $TMPBUILDDIR/openwrt
# run diffoscope on the results
# (this needs refactoring rather badly)