Bug 25538: Default to --login|-i if no command passed
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 10 Jun 2020 11:21:42 +0000 (13:21 +0200)
committerVictor Grousset/tuxayo <victor@tuxayo.net>
Wed, 17 Jun 2020 22:14:07 +0000 (00:14 +0200)
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>

(cherry picked from commit 02449287a89bdd611c4b33a3de0c7cd678daf41c)
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

debian/scripts/koha-shell

index bb74c80..7e6770f 100755 (executable)
@@ -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 "