From fa769448423d38c565b29c97483cd29553ba2494 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 15 Jun 2020 16:11:49 +0200 Subject: [PATCH] Bug 25752: Stay in cwd after koha-shell After bug 25538, after a koha-shell we are not longer in the current directory: root@cec7bffd8100:koha(master)$ pwd /kohadevbox/koha root@cec7bffd8100:koha(master)$ sudo koha-shell kohadev kohadev-koha@cec7bffd8100:~$ pwd /var/lib/koha/kohadev Test plan: Repeat the commands above and confirm that with this version of the script you get /kohadevbox/koha inside the koha-shell Search for possible regressions --- debian/scripts/koha-shell | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/scripts/koha-shell b/debian/scripts/koha-shell index 7e6770f590..eb59909f0f 100755 --- a/debian/scripts/koha-shell +++ b/debian/scripts/koha-shell @@ -20,6 +20,7 @@ use Modern::Perl; Getopt::Long::Configure("bundling"); +my $pwd = `pwd`; my %opts; my $res = GetOptions( \%opts, "command|c=s", "help|h", "login|l", "shell|s=s", "preserve-environment|p|m", "verbose|v" ); @@ -51,7 +52,7 @@ push @su_args, "env " . "KOHA_CONF=/etc/koha/sites/$instance/koha-conf.xml " . "PERL5LIB=$perl5lib $shell" - . ( $opts{command} ? " -c '$opts{command}'" : '' ); + . ( $opts{command} ? " -c '$opts{command}'" : " -c 'cd \"$pwd\"; $shell'" ); print "Command: '".join("' '",@su_args)."'\n" if $opts{verbose}; system("@su_args"); -- 2.20.1