michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor code cleanups

Browse Source
This commit is contained in:
Jamie Cameron
2022-11-12 17:48:25 -08:00
parent d82e89fb6b
commit 87d7eec743
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xterm/shellserver.pl Normal file → Executable file
View File

@@ -39,24 +39,23 @@ my $shellexec = $shellcmd;
my $shelllogin = "-".$shellname;
# Check for initialization file
if ($config{'rcfile'}) {
if ($config{'rcfile'} ne '0') {
# Load shell init default file from module root directory or custom file
my $rcdir = "$module_root_directory/rc";
my $rcfile = $config{'rcfile'} == 1 ?
# Load shell init default file from module root directory
my $rcfile = $config{'rcfile'} eq '1' ?
"$rcdir/.".$shellname."rc" :
# Load shell init custom file
$config{'rcfile'};
if ($rcfile =~ /^\~\//) {
if ($rcfile =~ /^\~\//) {
$rcfile =~ s/^\~\///;
$rcfile = "$uinfo[7]/$rcfile";
}
if (-r $rcfile) {
# Bash
if ($shellname eq 'bash') {
# Bash
$shellexec = "$shellcmd --rcfile $rcfile";
}
# Zsh
elsif ($shellname eq 'zsh') {
# Zsh
$ENV{'ZDOTDIR'} = $rcdir;
}
@@ -67,7 +66,7 @@ if ($config{'rcfile'}) {
}
my ($shellfh, $pid) = &proc::pty_process_exec($shellexec, $uid, $gid, $shelllogin);
&reset_environment();
my $shcmd = "'$shellexec".($shelllogin ? " $shelllogin" : undef)."'";
my $shcmd = "'$shellexec".($shelllogin ? " $shelllogin" : "")."'";
if (!$pid) {
&cleanup_miniserv();
die "Failed to run shell with $shcmd\n";