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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Joe Cooper
2017-05-16 23:49:07 -05:00
committed by GitHub
parent 368d7e0297 509e01eb90
commit 7316d87049
4 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
makemodulerpm.pl
View File

@@ -28,9 +28,8 @@ $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin";
my $allow_overwrite = 0;
my ($force_theme, $rpmdepends, $no_prefix, $vendor, $provides, $url,
$force_usermin, $final_mod, $sign, $epoch, $dir, $ver);
my @extrareqs;
my @exclude;
$force_usermin, $final_mod, $sign, $epoch, $dir, $ver, @extrareqs,
@exclude);
# Parse command-line args
while(@ARGV) {
@@ -210,7 +209,7 @@ foreach my $e (@exclude) {
system("/usr/bin/find /tmp/makemodulerpm -name ".quotemeta($e)." | xargs rm -rf");
}
# Set version in .info file to make command line, if given
# Set version in .info file to match command line, if given
if ($ver) {
if ($minfo{'desc'}) {
$minfo{'version'} = $ver;
@@ -221,8 +220,10 @@ if ($ver) {
&write_file("/tmp/makemodulerpm/$mod/theme.info", \%tinfo);
}
}
$ver ||= $iver; # Use module.info version, or 1
$ver ||= 1;
else {
$ver ||= $iver; # Use module.info version, or 1
$ver ||= 1;
}
# Tar up the directory
system("cd /tmp/makemodulerpm && tar czhf $rpm_source_dir/$mod.tar.gz $mod");