Split setup-html and running-html logic in END block.

bluhm · Nov 9, 2023 · 9aac8fc · 9aac8fc
1 parent 022bcc3
commit 9aac8fc
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/make.pl b/make.pl
@@ -102,7 +102,9 @@ END
     if ($odate) {
 	my @cmd = ("$regressdir/bin/bsdcons.pl", '-h', $opts{h}, '-d', $odate);
 	system(@cmd);
-	@cmd = ("$regressdir/bin/setup-html.pl");
+    }
+    if ($regressdir) {
+	my @cmd = ("$regressdir/bin/setup-html.pl");
 	system(@cmd);
 	@cmd = ("$regressdir/bin/running-html.pl");
 	system(@cmd);

diff --git a/net.pl b/net.pl
@@ -149,7 +149,9 @@ END
     if ($odate) {
 	my @cmd = ("$netlinkdir/bin/bsdcons.pl", '-h', $opts{h}, '-d', $odate);
 	system(@cmd);
-	@cmd = ("$netlinkdir/bin/setup-html.pl");
+    }
+    if ($netlinkdir) {
+	my @cmd = ("$netlinkdir/bin/setup-html.pl");
 	system(@cmd);
 	@cmd = ("$netlinkdir/bin/running-html.pl");
 	system(@cmd);

diff --git a/once.pl b/once.pl
@@ -164,10 +164,12 @@ END
 	    release => $release);
 	relogdie();
     }
-    my @cmd = ("$performdir/bin/setup-html.pl");
-    system(@cmd) if $performdir;
-    @cmd = ("$performdir/bin/running-html.pl");
-    system(@cmd) if $performdir;
+    if ($performdir) {
+	my @cmd = ("$performdir/bin/setup-html.pl");
+	system(@cmd);
+	@cmd = ("$performdir/bin/running-html.pl");
+	system(@cmd);
+    }
 };
 powerup_hosts(cvsdate => $cvsdate, patch => $patch, modify => $modify,
     release => $release);

diff --git a/run.pl b/run.pl
@@ -107,10 +107,12 @@ END
 	bsdcons_hosts();
 	relogdie();
     }
-    my @cmd = ("$regressdir/bin/setup-html.pl");
-    system(@cmd) if $regressdir;
-    @cmd = ("$regressdir/bin/running-html.pl");
-    system(@cmd) if $regressdir;
+    if ($regressdir) {
+	my @cmd = ("$regressdir/bin/setup-html.pl");
+	system(@cmd);
+	@cmd = ("$regressdir/bin/running-html.pl");
+	system(@cmd);
+    }
 };
 if ($patch || !($setupmode{keep} || $setupmode{reboot})) {
     setup_hosts(patch => $patch, mode => \%setupmode);

diff --git a/step.pl b/step.pl
@@ -180,10 +180,12 @@ END
 	bsdcons_hosts(release => $release);
 	relogdie();
     }
-    my @cmd = ("$performdir/bin/setup-html.pl");
-    system(@cmd) if $performdir;
-    @cmd = ("$performdir/bin/running-html.pl");
-    system(@cmd) if $performdir;
+    if ($performdir) {
+	my @cmd = ("$performdir/bin/setup-html.pl");
+	system(@cmd);
+	@cmd = ("$performdir/bin/running-html.pl");
+	system(@cmd);
+    }
 };
 if (!$setupmode{keep}) {
     setup_hosts(release => $release, mode => \%setupmode);

diff --git a/test.pl b/test.pl
@@ -98,7 +98,9 @@ END
     if ($odate) {
 	my @cmd = ("$regressdir/bin/bsdcons.pl", '-h', $opts{h}, '-d', $odate);
 	system(@cmd);
-	@cmd = ("$regressdir/bin/setup-html.pl");
+    }
+    if ($regressdir) {
+	my @cmd = ("$regressdir/bin/setup-html.pl");
 	system(@cmd);
 	@cmd = ("$regressdir/bin/running-html.pl");
 	system(@cmd);