@@ -, +, @@ --- debian/scripts/koha-disable | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) --- a/debian/scripts/koha-disable +++ a/debian/scripts/koha-disable @@ -17,7 +17,7 @@ # along with this program. If not, see . -set -e +set -e # include helper functions if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then @@ -29,19 +29,16 @@ fi disable_instance() { - local site=$1 - local instancefile=$(get_apache_config_for $site) + local instancename=$1 + local instancefile=$(get_apache_config_for "$instancename") - if [ "$instancefile" = ""]; then - return 2 - fi - - if is_enabled $instancename; then - sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' \ - "$instancefile" - return 0 + if [ "$instancefile" = "" ]; then + echo 2 + elif is_enabled $instancename; then + sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' "$instancefile" + echo 0 else - return 1 + echo 1 fi } @@ -60,13 +57,12 @@ EOF [ $# -ge 1 ] || ( usage ; die "Missing instance name..." ) restart_apache="no" - for name in "$@" do if is_instance $name ; then RET=$(disable_instance $name) if [ "$RET" = 0 ]; then - restart_apache="yes" + restart_apache="yes" elif [ "$RET" = 2 ]; then warn "Error: Apache configuration file not present for instance $name." else @@ -82,3 +78,4 @@ if [ "$restart_apache" = "yes" ]; then fi exit 0 + --