michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-21 20:00:26 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Accept either .pl or no extension

Browse Source
This commit is contained in:
Joe Cooper
2018-11-13 03:01:30 -06:00
parent ad5a6c6901
commit d65db8a283
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/webmin
View File

@@ -69,15 +69,26 @@ sub run_command {
$module_name = $dir;
my $barecmd = substr($subcmd, -(length($subcmd)-length($module_name)-1));
$command = File::Spec->catfile($root, $dir, 'bin', $barecmd);
die "$command doesn't exist or is not executable" unless
( -x $command );
last; # Found one, and it's executable.
# Could be .pl or no extension
if ( -x $command ) {
last;
} elsif ( -x $command . ".pl" ) {
$command = $command . ".pl";
last;
} else {
die "$command doesn't exist or is not executable"
}
}
}
}
# Merge the options
# Only handling config, right now...
# XXX Should we do this with libraries instead of commands?
# Would need less boilerplate if they weren't standalone commands.
my @allopts = ("--config $optref->{'config'}", @$remainref);
# Run that binch
system($command, @$remainref);
system($command, @allopts);
}
sub root {