procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* make-dist: Simplify trap handling.

Browse source
This commit is contained in:
Glenn Morris 2010-10-12 00:44:12 -07:00
parent 6f3ed07fed
commit 5c845a0107
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
make-dist
View file

@ -299,7 +299,7 @@ tempdir="${tempparent}/${emacsname}"
### 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 @@ if [ "${make_tar}" = yes ]; then
> ${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