From 02449287a89bdd611c4b33a3de0c7cd678daf41c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 10 Jun 2020 13:21:42 +0200
Subject: [PATCH] Bug 25538: Default to --login|-i if no command passed

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit c9be26ad5ac7615f2f723900dfd16d83d71b66fe)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 06e121115fa9e9d723f20b6fff17336f18081704)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
---
 debian/scripts/koha-shell | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/koha-shell b/debian/scripts/koha-shell
index bb74c8073d..7e6770f590 100755
--- a/debian/scripts/koha-shell
+++ b/debian/scripts/koha-shell
@@ -45,8 +45,8 @@ my $perl5lib = read_perl5lib( $instance );
 my @su_args;
 push @su_args, '/usr/bin/sudo';
 push @su_args, '--preserve-env' if $opts{'preserve-environment'};
-push @su_args, '--login' if $opts{login};
-push @su_args, "-u", "$instance-koha", "-i";
+push @su_args, '--login' if $opts{login} || !$opts{command};
+push @su_args, "-u", "$instance-koha";
 push @su_args,
     "env "
   . "KOHA_CONF=/etc/koha/sites/$instance/koha-conf.xml "
-- 
2.20.1