michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to use new file names for modes

Browse Source
This commit is contained in:
Ilia Ross
2025-06-05 23:38:46 +03:00
parent d519c4099f
commit 282b28da5e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makedist.pl
View File

@@ -2,7 +2,7 @@
# Builds a tar.gz package of a specified Webmin version # Builds a tar.gz package of a specified Webmin version
# Parse command line options # Parse command line options
$mod_list = 'def'; $mod_list = 'full';
@ARGV = map { /^--\S+\s+/ ? split(/\s+/, $_) : $_ } @ARGV; @ARGV = map { /^--\S+\s+/ ? split(/\s+/, $_) : $_ } @ARGV;
while (@ARGV && $ARGV[0] =~ /^--?/) { while (@ARGV && $ARGV[0] =~ /^--?/) {
my $opt = shift(@ARGV); my $opt = shift(@ARGV);
@@ -285,6 +285,6 @@ close(ARFILE);
sub usage sub usage
{ {
die "Usage: $0 [--minimal] [--mod-list file] <version>\n"; die "Usage: $0 [--minimal] [--mod-list type] <version>\n";
} }

2
makemoduledeb.pl
View File

@@ -246,7 +246,7 @@ if ($debdepends && exists($minfo{'depends'})) {
my $curr_dir = $0; my $curr_dir = $0;
($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/; ($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/;
$curr_dir = "." if ($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); next if (! -r $mod_def_file);
open(my $fh, '<', $mod_def_file) || open(my $fh, '<', $mod_def_file) ||
die "Error opening \"$mod_def_file\" : $!\n"; die "Error opening \"$mod_def_file\" : $!\n";

2
makemodulerpm.pl
View File

@@ -267,7 +267,7 @@ if ($rpmdepends && defined($minfo{'depends'})) {
my $curr_dir = $0; my $curr_dir = $0;
($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/; ($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/;
$curr_dir = "." if ($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); next if (! -r $mod_def_file);
open(my $fh, '<', $mod_def_file) || open(my $fh, '<', $mod_def_file) ||
die "Error opening \"$mod_def_file\" : $!\n"; die "Error opening \"$mod_def_file\" : $!\n";

0
mod_def_list.txt → mod_full_list.txt
View File