Fix nightly's sandbox cleanup not to hang when stdin is a tty

"rm -r" prompts for read-only files when stdin is a tty.  Probably
broken since we install builtin configuration read-only, in commit
b4161cd7, v4.3.0.

Move "done" message to the right place.  Broken in commit 70c03561,
v4.3.12.

diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh
index b51d1a2701f40eb7e01964c095d21de208d620e7..088c7aca33474606e10cd374215511997838b636 100755 (executable)
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@@ -478,12 +478,11 @@ in
 rm -rf `find "${WORKDIR}" -maxdepth 1 ! -name .git` || warn "Directory ${WORKDIR} could not be forcibly removed !"
                ;;
        *)
-rm -r "${WORKDIR}" || warn "Directory ${WORKDIR} could not be cleanly removed !"
 rm -rf "${WORKDIR}" || warn "Directory ${WORKDIR} could not be forcibly removed !"
 [ -d "${WORKDIR}/." ] && warn "Directory ${WORKDIR} still present"
-echo "Done (cleaning)."
                ;;
 esac
+echo "Done (cleaning)."
                ;;
 esac
 #