From 87d7eec7431b8c00eba6af0fa849cb69434fa17b Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 12 Nov 2022 17:48:25 -0800
Subject: [PATCH] Minor code cleanups

---
 xterm/shellserver.pl | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 xterm/shellserver.pl

diff --git a/xterm/shellserver.pl b/xterm/shellserver.pl
old mode 100644
new mode 100755
index c1f75539e..b6ec135e4
--- a/xterm/shellserver.pl
+++ b/xterm/shellserver.pl
@@ -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";