VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to re-arrange flags order and script's help

Browse Source
This commit is contained in:
Ilia Ross
2025-05-30 16:45:04 +03:00
parent 784435d3ca
commit 60d4eadcd1
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
makemodulerpm.pl
View File

@ -40,33 +40,21 @@ my ($force_theme, $rpmdepends, $rpmrecommends, $no_prefix, $set_prefix, $vendor,
while(@ARGV) {
# XXX Untainting isn't needed when running as non-root?
my $a = &untaint(shift(@ARGV));
if ($a eq "--force-theme") {
$force_theme = 1;
}
elsif ($a eq "--rpm-dir") {
$basedir = &untaint(shift(@ARGV));
}
elsif ($a eq "--licence" || $a eq "--license") {
$licence = &untaint(shift(@ARGV));
}
elsif ($a eq "--rpm-depends") {
if ($a eq "--rpm-depends") {
$rpmdepends = 1;
}
elsif ($a eq "--rpm-recommends") {
$rpmrecommends = 1;
}
elsif ($a eq "--no-prefix") {
$no_prefix = 1;
}
elsif ($a eq "--prefix") {
$set_prefix = &untaint(shift(@ARGV));
}
elsif ($a eq "--vendor") {
$vendor = &untaint(shift(@ARGV));
}
# --recommends, --suggests, --conflicts, --provides and --obsoletes are
# not for Webmin modules, and not meant to have prefix, and populated
# from module.info automatically
elsif ($a eq "--no-prefix") {
$no_prefix = 1;
}
elsif ($a eq "--licence" || $a eq "--license") {
$licence = &untaint(shift(@ARGV));
}
elsif ($a eq "--url") {
$url = shift(@ARGV);
}
@ -85,6 +73,18 @@ while(@ARGV) {
elsif ($a eq "--allow-overwrite") {
$allow_overwrite = 1;
}
elsif ($a eq "--force-theme") {
$force_theme = 1;
}
elsif ($a eq "--rpm-dir") {
$basedir = &untaint(shift(@ARGV));
}
elsif ($a eq "--prefix") {
$set_prefix = &untaint(shift(@ARGV));
}
elsif ($a eq "--vendor") {
$vendor = &untaint(shift(@ARGV));
}
elsif ($a eq "--sign") {
$sign = 1;
}
@ -114,13 +114,13 @@ while(@ARGV) {
# Validate args
if (!$dir) {
print "usage: ";
print CYAN, "makemodulerpm.pl ";
print YELLOW, "[--force-theme]\n";
print " [--rpm-dir directory]\n";
print CYAN, "makemodulerpm.pl <module> [version]", RESET;
print YELLOW, "\n";
print " [--rpm-depends]\n";
print " [--rpm-recommends]\n";
print " [--rpm-dir directory]\n";
print " [--no-prefix]\n";
print " [--prefix prefix]\n";
print " [--prefix prefix]\n";
print " [--vendor name]\n";
print " [--licence name]\n";
print " [--url url]\n";
@ -130,8 +130,11 @@ if (!$dir) {
print " [--target-dir directory]\n";
print " [--dir directory-in-package]\n";
print " [--allow-overwrite]\n";
print CYAN, " <module> ";
print YELLOW, "[version]\n", RESET;
print " [--force-theme]\n";
print " [--sign]\n";
print " [--key keyname]\n";
print " [--exclude file]\n";
print RESET, "\n";
exit(1);
}
my $par;