Mercurial > emacs
changeset 110949:aa38b4aad856
* make-dist: Simplify trap handling.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 12 Oct 2010 00:44:12 -0700 |
| parents | a2f817d28d08 |
| children | 77c12a233de2 |
| files | make-dist |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make-dist Tue Oct 12 00:31:58 2010 -0700 +++ b/make-dist Tue Oct 12 00:44:12 2010 -0700 @@ -299,7 +299,7 @@ ### This trap ensures that the staging directory will be cleaned up even ### when the script is interrupted in mid-career. if [ "${clean_up}" = yes ]; then - trap "echo 'Interrupted...cleaning up the staging directory'; rm -rf ${tempparent}; exit 1" 1 2 15 + trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT fi echo "Creating top directory: \`${tempdir}'" @@ -571,10 +571,7 @@ > ${emacsname}.tar${gzip_extension} fi -if [ "${clean_up}" = yes ]; then - echo "Cleaning up the staging directory" - rm -rf ${tempparent} -else +if [ "${clean_up}" != yes ]; then (cd ${tempparent}; mv ${emacsname} ..) rm -rf ${tempparent} fi