From d087f9f024a1bfb360877f397cd3946f4080e044 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Tue, 24 Jun 2025 13:33:26 +0300
Subject: [PATCH] Fix to correctly concatenate if string is empty

---
 makemoduledeb.pl | 5 +++--
 makemodulerpm.pl | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/makemoduledeb.pl b/makemoduledeb.pl
index 0e63f2855..4c2504610 100755
--- a/makemoduledeb.pl
+++ b/makemoduledeb.pl
@@ -285,7 +285,7 @@ if (exists($minfo{'deb_requires'})) {
 	foreach my $debrequire (split(/\s+/, $minfo{'deb_requires'})) {
 		push(@rrequires, $debrequire);
 		}
-	$rdeps .= ", " . join(", ", @rrequires) if (@rrequires);
+	$rdeps .= ($rdeps ? ', ' : '') . join(", ", @rrequires) if (@rrequires);
 	}
 
 # Build (append) list of recommended packages (not Webmin modules)
@@ -294,7 +294,8 @@ if (exists($minfo{'deb_recommends'})) {
 	foreach my $debrecommend (split(/\s+/, $minfo{'deb_recommends'})) {
 		push(@rrecommends, $debrecommend);
 		}
-	$rrecom .= ", " . join(", ", @rrecommends) if (@rrecommends);
+	$rrecom .= ($rrecom ? ', ' : '') . join(", ", @rrecommends)
+		if (@rrecommends);
 	}
 
 # Build (standalone) list of suggested packages (not Webmin modules)
diff --git a/makemodulerpm.pl b/makemodulerpm.pl
index 7ee5fe9cd..5ae1eb860 100755
--- a/makemodulerpm.pl
+++ b/makemodulerpm.pl
@@ -312,7 +312,7 @@ if (exists($minfo{'rpm_requires'})) {
 	foreach my $rpmrequire (split(/\s+/, $minfo{'rpm_requires'})) {
 		push(@rrequires, $rpmrequire);
 		}
-	$rdeps .= " " . join(" ", @rrequires) if (@rrequires);
+	$rdeps .= ($rdeps ? ' ' : '') . join(" ", @rrequires) if (@rrequires);
 	}
 
 # Build (append) list of recommended packages (not Webmin modules)
@@ -321,7 +321,8 @@ if (exists($minfo{'rpm_recommends'})) {
 	foreach my $rpmrecommend (split(/\s+/, $minfo{'rpm_recommends'})) {
 		push(@rrecommends, $rpmrecommend);
 		}
-	$rrecom .= " " . join(" ", @rrecommends) if (@rrecommends);
+	$rrecom .= ($rrecom ? ' ' : '') . join(" ", @rrecommends)
+		if (@rrecommends);
 	}
 
 # Build (standalone) list of suggested packages (not Webmin modules)