summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2016-12-15 13:27:26 (GMT)
committerElan Ruusamäe2016-12-15 13:27:26 (GMT)
commit5135a2964e9a39f6efcf6c6702fc28b229dfd41a (patch)
tree5f3a218bb30c53b47c4718b168b44575513c5387
parenta7f78886745a1c9cb579bb25dfb5e7bedc9f397a (diff)
downloadcleanbuild-5135a2964e9a39f6efcf6c6702fc28b229dfd41a.zip
cleanbuild-5135a2964e9a39f6efcf6c6702fc28b229dfd41a.tar.gz
fix path to package.spec in addbr
-rwxr-xr-xaddbr2
-rwxr-xr-xdocker-builder.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/addbr b/addbr
index b101e39..b04afa6 100755
--- a/addbr
+++ b/addbr
@@ -19,7 +19,7 @@ warn "Adding: $add\n";
my $file = $fname;
$file = "$ENV{HOME}/rpm/packages/$fname/$fname.spec"
unless -r $file;
--r $file or die;
+-r $file or die "Can't read $file";
open FILE, "<", $file;
my @in = <FILE>;
diff --git a/docker-builder.sh b/docker-builder.sh
index d88e580..798f1f0 100755
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -49,11 +49,11 @@ while true; do
findbr=$package.findbr.log
- docker exec $name cleanbuild/findbr rpm/BUILD/* cleanbuild/$buildlog > $findbr
+ docker exec $name cleanbuild/findbr 'rpm/BUILD/*' cleanbuild/$buildlog > $findbr
installed_something=false
while read pkg msg; do
- ./addbr $package "$pkg" "$msg"
+ ./addbr rpm/packages/$package/$package.spec "$pkg" "$msg"
installed_something=true
done < $findbr
rm -f $findbr