diff options
| author | David Bremner <bremner@debian.org> | 2023-09-04 08:32:22 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2023-09-04 08:50:59 -0300 |
| commit | aa90a5dfadd52d9ababc3a76fa32d8b53cbdb8a9 (patch) | |
| tree | 940154316d4740c428b3b40e9299f50a726c96a4 | |
| parent | b1186a682aa779098b8cfdf96d0d8463b5441c12 (diff) | |
Upload 2.1.1: improve remove templatedebian/2.1.1archive/debian/2.1.1
Add --one-file-system to "rm -rf". Remove site-lisp/elpa if it is
empty.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | emacsen-common/remove | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f5c016e..9f30538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dh-elpa (2.1.1) experimental; urgency=medium + + * Remove /usr/share/$flavor/site-lisp/elpa (from emacsen-remove) + if it is empty + + -- David Bremner <bremner@debian.org> Mon, 04 Sep 2023 08:30:35 -0300 + dh-elpa (2.1.0) experimental; urgency=medium * Call emacsen-remove script directly from generated prerm. For now this diff --git a/emacsen-common/remove b/emacsen-common/remove index cf7eb1e..1019db8 100755 --- a/emacsen-common/remove +++ b/emacsen-common/remove @@ -3,4 +3,8 @@ # or directly from the package prerm set -e -rm -rf "/usr/share/$1/site-lisp/elpa/#ELPAPACKAGE#-#ELPAVERSION#" +elpadir="/usr/share/$1/site-lisp/elpa" +rm --one-file-system -rf "$elpadir/#ELPAPACKAGE#-#ELPAVERSION#" +if [ -d "$elpadir" ]; then + rmdir --ignore-fail-on-non-empty "$elpadir" +fi |