From de76cd9c5c60bf737c6fe32a99b4dfabccf4c5c3 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 14 Dec 2016 16:48:45 +0100 Subject: [PATCH] Bug 17777: koha-remove should deal with temporary uploads If the temporary upload folder exists, it should be discarded when removing an instance. If we do not, it may/will create problems when recreating the same instance. A function in koha-functions.sh is added to determine the temp directory instead of hardcoding /tmp. Test plan: [1] Copy koha-functions.sh to /usr/share/koha/bin [2] Run koha-create --create-db newinstancexx [3] Run mkdir /tmp/koha_newinstancexx_upload (if /tmp is your temp!) [4] Run debian/scripts/koha-remove newinstancexx Do not run the regular one, but verify that you use the updated one. [5] Check that /tmp/koha_newinstancexx_upload is gone. Signed-off-by: Marcel de Rooy Signed-off-by: Karen Jen Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 2c40579077b67d4203665b7e6ecdb749235456a4) Signed-off-by: Katrin Fischer --- debian/scripts/koha-functions.sh | 20 ++++++++++++++++++++ debian/scripts/koha-remove | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh index cf6835d8ad..fc1a329ea8 100755 --- a/debian/scripts/koha-functions.sh +++ b/debian/scripts/koha-functions.sh @@ -233,3 +233,23 @@ get_loglevels() fi } + +get_tmpdir() +{ + if [ "$TMPDIR" != "" ]; then + if [ -d "$TMPDIR" ]; then + echo $TMPDIR + return 0 + fi + # We will not unset TMPDIR but just default to /tmp here + # Note that mktemp (used later) would look at TMPDIR + echo "/tmp" + return 0 + fi + local retval=$(mktemp -u) + if [ "$retval" = "" ]; then + echo "/tmp" + return 0 + fi + echo $(dirname $retval) +} diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove index 67e2402773..763da29ae5 100755 --- a/debian/scripts/koha-remove +++ b/debian/scripts/koha-remove @@ -108,6 +108,12 @@ eof rm "/etc/koha/sites/$name/zebra-authorities-dom.cfg" [ -f "/etc/koha/sites/$name/zebra.passwd" ] && \ rm "/etc/koha/sites/$name/zebra.passwd" + + tempdir=$(get_tmpdir) + [ -d "$tempdir/koha_${name}_upload" ] && \ + # Temporary uploads can be discarded, apart from purgeall + rm -r "$tempdir/koha_${name}_upload" + [ -f "/var/lib/koha/$name/letsencrypt.enabled" ] && \ rm -r "/var/lib/koha/$name/letsencrypt.enabled" [ -f "/etc/letsencrypt/renewal/$le_opacdomain.conf" ] && \ -- 2.39.5