From fe8eb50f2d4dc677b31753bf0c370a526f77581f Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Tue, 18 Apr 2017 22:01:32 -0700 Subject: [PATCH] Fix a couple of small bugs on my system --- makemodulerpm.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makemodulerpm.pl b/makemodulerpm.pl index e4de7120a..1e00dba45 100755 --- a/makemodulerpm.pl +++ b/makemodulerpm.pl @@ -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"); }