Bugzilla – Attachment 9533 Details for
Bug 6684
koha-remove should check the number of arguments it gets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6684: Fixes to koha-remove
Bug-6684-Fixes-to-koha-remove.patch (text/plain), 3.32 KB, created by
Jared Camins-Esakov
on 2012-05-13 11:00:02 UTC
(
hide
)
Description:
Bug 6684: Fixes to koha-remove
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-05-13 11:00:02 UTC
Size:
3.32 KB
patch
obsolete
>From 834eb8c60f41b397c33a6c1aabc06b2ab46e57ae Mon Sep 17 00:00:00 2001 >From: Simon Story <simon.story@catalyst-eu.net> >Date: Fri, 18 Nov 2011 14:52:09 +0000 >Subject: [PATCH] Bug 6684: Fixes to koha-remove >Content-Type: text/plain; charset="UTF-8" > >Fixes bugs 6684 6997 4880: >6684 koha-remove should check the number of arguments it gets >6997 koha-remove leaves system in inconsistent state if there is an error >4880 koha-remove sometimes fails because user is logged in > >Amended by chrisc@catalyst.net.nz >Trying to resolve conflicts. > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >Rebased on top of bug 7924. >--- > debian/scripts/koha-remove | 35 +++++++++++++++++++++++++++++------ > 1 files changed, 29 insertions(+), 6 deletions(-) > >diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove >index 567ead8..8d7fc50 100755 >--- a/debian/scripts/koha-remove >+++ b/debian/scripts/koha-remove >@@ -31,20 +31,41 @@ do > shift > done > >-for name in "$@" >+NAMES="$@" >+ >+SITECONFDIR="/etc/koha/sites" >+# There has to be a better way of excluding '.' from find. But this works. >+INSTANCES=`cd $SITECONFDIR && find . -type d -printf " %f" |sed s/\ .\ //` >+ >+if [ -z $NAMES ] ; then >+ echo "Please specify a Koha instance name. Your choices are:" >+ echo "$INSTANCES" >+ exit 1 >+fi >+ >+for name in $NAMES > do >+ # Does the directory (ie instance) name exist? >+ if [ ! -d $SITECONFDIR/$name ] ; then >+ echo Koha configuration directory for instance \"$name\" does not exist, please specify a valid Koha instance >+ exit 1 >+ fi >+ > echo "Removing Koha instance $name" > > if [ "$keepmysql" != "1" ] > then >- mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof >+ # The grant creates the user in case it isn't, we don't want our loop to fail if it has already being deleted. >+ mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof >+GRANT USAGE ON \`koha_$name\`.* TO \`koha_$name\`@\`%\`; > DROP USER \`koha_$name\`; >-DROP DATABASE \`koha_$name\`; >+DROP DATABASE IF EXISTS \`koha_$name\`; > FLUSH PRIVILEGES; > eof > fi #` > >- koha-stop-zebra $name >+ # If the daemon is not running already, we don't want to fail this loop. So bin the result code if this fails. >+ koha-stop-zebra $name | /bin/true > [ -f "/etc/apache2/sites-available/$name" ] && \ > rm "/etc/apache2/sites-available/$name" > [ -f "/etc/koha/sites/$name/koha-conf.xml" ] && \ >@@ -57,8 +78,9 @@ eof > rm "/etc/koha/sites/$name/zebra-authorities-dom.cfg" > [ -f "/etc/koha/sites/$name/zebra.passwd" ] && \ > rm "/etc/koha/sites/$name/zebra.passwd" >+ # Maybe a user has left something in the config directory they want to keep? We won't delete it here, nor throw an error if the have. > [ -d "/etc/koha/sites/$name" ] && \ >- rmdir "/etc/koha/sites/$name" >+ rmdir --ignore-fail-on-non-empty "/etc/koha/sites/$name" > [ -d "/var/lock/koha/$name" ] && \ > rm -r "/var/lock/koha/$name" > [ -d "/var/log/koha/$name" ] && \ >@@ -66,7 +88,8 @@ eof > [ -d "/var/run/koha/$name" ] && \ > rm -r "/var/run/koha/$name" > getent passwd "$name-koha" > /dev/null && deluser --quiet "$name-koha" >- a2dissite "$name" >+ # in case the site has already been disabled, we don't want to break the loop now. >+ a2dissite "$name" | /bin/true > done > > service apache2 restart >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6684
:
6320
|
6336
|
9003
| 9533