From 282b28da5e7419da138c76bd587bd28761fa20ba Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Thu, 5 Jun 2025 23:38:46 +0300 Subject: [PATCH] Fix to use new file names for modes --- makedist.pl | 4 ++-- makemoduledeb.pl | 2 +- makemodulerpm.pl | 2 +- mod_def_list.txt => mod_full_list.txt | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename mod_def_list.txt => mod_full_list.txt (100%) diff --git a/makedist.pl b/makedist.pl index 23f389d27..38c83bcea 100755 --- a/makedist.pl +++ b/makedist.pl @@ -2,7 +2,7 @@ # Builds a tar.gz package of a specified Webmin version # Parse command line options -$mod_list = 'def'; +$mod_list = 'full'; @ARGV = map { /^--\S+\s+/ ? split(/\s+/, $_) : $_ } @ARGV; while (@ARGV && $ARGV[0] =~ /^--?/) { my $opt = shift(@ARGV); @@ -285,6 +285,6 @@ close(ARFILE); sub usage { - die "Usage: $0 [--minimal] [--mod-list file] \n"; + die "Usage: $0 [--minimal] [--mod-list type] \n"; } diff --git a/makemoduledeb.pl b/makemoduledeb.pl index b7a51a223..3e062c6fa 100755 --- a/makemoduledeb.pl +++ b/makemoduledeb.pl @@ -246,7 +246,7 @@ if ($debdepends && exists($minfo{'depends'})) { my $curr_dir = $0; ($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/; $curr_dir = "." if ($curr_dir !~ /^\//); - my $mod_def_file = "$curr_dir/mod_def_list.txt"; + my $mod_def_file = "$curr_dir/mod_full_list.txt"; next if (! -r $mod_def_file); open(my $fh, '<', $mod_def_file) || die "Error opening \"$mod_def_file\" : $!\n"; diff --git a/makemodulerpm.pl b/makemodulerpm.pl index 89357c911..f7aa7f9df 100755 --- a/makemodulerpm.pl +++ b/makemodulerpm.pl @@ -267,7 +267,7 @@ if ($rpmdepends && defined($minfo{'depends'})) { my $curr_dir = $0; ($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/; $curr_dir = "." if ($curr_dir !~ /^\//); - my $mod_def_file = "$curr_dir/mod_def_list.txt"; + my $mod_def_file = "$curr_dir/mod_full_list.txt"; next if (! -r $mod_def_file); open(my $fh, '<', $mod_def_file) || die "Error opening \"$mod_def_file\" : $!\n"; diff --git a/mod_def_list.txt b/mod_full_list.txt similarity index 100% rename from mod_def_list.txt rename to mod_full_list.txt