From a94ae5f8c1f99bf972175318fc3f09dbcf995fcc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 15 Jan 2011 14:39:30 +0100 Subject: [PATCH] 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. --- src/scripts/nightly/nightlybuild.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh index b51d1a270..088c7aca3 100755 --- 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 # -- 2.43.0