46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
|
From b9892197a50058f4e788ef8386f69f49696bab62 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mark Nudelman <markn@greenwoodsoftware.com>
|
||
|
|
Date: Sun, 9 Oct 2022 22:39:35 -0700
|
||
|
|
Subject: [PATCH 08/48] lesstest: maketest should not overwrite existing lt
|
||
|
|
file.
|
||
|
|
|
||
|
|
---
|
||
|
|
lesstest/maketest | 18 +++++++++++++++---
|
||
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lesstest/maketest b/lesstest/maketest
|
||
|
|
index ee4ead7..6769c64 100755
|
||
|
|
--- a/lesstest/maketest
|
||
|
|
+++ b/lesstest/maketest
|
||
|
|
@@ -15,12 +15,24 @@ sub main {
|
||
|
|
my $lesstest = ($opt{t} or "./lesstest");
|
||
|
|
my $lt_screen = ($opt{s} or "./lt_screen");
|
||
|
|
my $less = ($opt{l} or "../obj/less");
|
||
|
|
- my $ltfile = ($opt{o} or "lt/$textfile.lt");
|
||
|
|
my $lines = ($opt{h} or $ENV{LINES}-1);
|
||
|
|
my $columns = ($opt{w} or $ENV{COLUMNS}-1);
|
||
|
|
my $lt_opts = ($opt{O} or "");
|
||
|
|
$lt_opts = "-$lt_opts" if $lt_opts =~ /^[^-]/;
|
||
|
|
-
|
||
|
|
+ my $ltfile = $opt{o};
|
||
|
|
+ if (not defined $ltfile) {
|
||
|
|
+ for (my $i = 0;; ++$i) {
|
||
|
|
+ my $suffix = $i ? $i : "";
|
||
|
|
+ $ltfile = "lt/$textfile$suffix.lt";
|
||
|
|
+ last if not -e $ltfile;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
my $cmd = "LINES=$lines COLUMNS=$columns $lesstest $lt_opts -o '$ltfile' -- $less '$textfile'";
|
||
|
|
- exit system $cmd;
|
||
|
|
+ my $err = system($cmd);
|
||
|
|
+ if ($err) {
|
||
|
|
+ unlink $ltfile;
|
||
|
|
+ } else {
|
||
|
|
+ print "created $ltfile\n";
|
||
|
|
+ }
|
||
|
|
+ exit $err;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|