[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101931: * make-dist: Simplify trap h
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101931: * make-dist: Simplify trap handling. |
Date: |
Tue, 12 Oct 2010 00:44:12 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101931
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-12 00:44:12 -0700
message:
* make-dist: Simplify trap handling.
modified:
make-dist
=== modified file 'make-dist'
--- a/make-dist 2010-10-12 07:31:58 +0000
+++ b/make-dist 2010-10-12 07:44:12 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101931: * make-dist: Simplify trap handling.,
Glenn Morris <=