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

Fix a couple of small bugs on my system

Browse Source
This commit is contained in:
Jamie Cameron
2017-04-18 22:01:32 -07:00
parent 25d7fe4299
commit fe8eb50f2d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
makemodulerpm.pl
View File

@@ -8,6 +8,7 @@ use warnings;
use Term::ANSIColor qw(:constants);
my $basedir;
# Does any system still have a redhat dir?
if (-d "$ENV{'HOME'}" . "/redhat") {
$basedir = "$ENV{'HOME'}" . "/redhat";
@@ -15,6 +16,9 @@ if (-d "$ENV{'HOME'}" . "/redhat") {
elsif (-d "$ENV{'HOME'}" . "/rpmbuild") {
$basedir = "$ENV{'HOME'}" . "/rpmbuild";
}
else {
$basedir = "/usr/src/redhat";
}
my $target_dir = "$basedir" . "/RPMS/noarch"; # where to copy the RPM to
my $licence = "BSD";
@@ -256,6 +260,7 @@ AutoReq: 0
License: $licence
Group: System/Tools
Source: $mod.tar.gz
BuildRoot: /tmp/%{name}-%{version}
BuildArchitectures: noarch
$epochheader
$providesheader
@@ -392,7 +397,7 @@ if ($target_dir =~ /:/) {
# scp to dest
system("scp $rpm_dir/$prefix$mod-$ver-$release.noarch.rpm $target_dir/$prefix$mod-$ver-$release.noarch.rpm");
}
else {
elsif ($rpm_dir ne $target_dir) {
# Just copy
system("/bin/cp $rpm_dir/$prefix$mod-$ver-$release.noarch.rpm $target_dir/$prefix$mod-$ver-$release.noarch.rpm");
}