X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4559aa03eb68b93ea84a1b9aced2407ecb6eebda..bbfd1d6aa20672e800a65da27f11fdd61083c1e9:/Rakefile

diff --git a/Rakefile b/Rakefile
index ae966bfd..c0927c0f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
 require 'rugged'
+require 'pty'
 
 task default: %w[build]
 
@@ -6,13 +7,32 @@ task :build do
   repo = Rugged::Repository.new('.')
   commit = repo.head.target
   parent = commit.parents.first
-  paths = commit.diff(parent).deltas.map { |d| d.new_file[:path] }
-  paths = paths.map { |p| Pathname.new(p).each_filename.to_a }
-  # looking for packages/[package]/...
-  packages = paths.map { |p| p[1] if p.length > 2 and p[0] == "packages" }
-  packages = packages.flatten.uniq
-  packages.each do |package|
-    puts package
-    printf `./scripts/run-docker.sh ./build-package.sh #{package}`
+  pkgs = commit.diff(parent).deltas.map { |d| d.new_file[:path] }
+  # Split paths into arrays
+  pkgs.map! { |p| Pathname.new(p).each_filename.to_a }
+  # looking for [disabled-]packages/(package_name)/...
+  pkgs.select! { |p| p.length > 2 and p[0] =~ /(?<disabled->)packages/ }
+  # Get package_name
+  pkgs.map! { |p| p[1] }
+  # Remove duplicate packages
+  pkgs.uniq!
+  pkgs.each do |pkg|
+    puts "Building #{pkg}"
+    begin
+      # Start blocking build loop
+      PTY.spawn("./scripts/run-docker.sh ./build-package.sh #{pkg}") do |stdout, stdin, pid|
+        begin
+          stdout.each { |line| print line }
+        rescue Errno::EIO
+        end
+      end
+    rescue PTY::ChildExited
+      puts "Process exited"
+    end
+    # Exit if PTY return a non-zero code
+    if $?.exitstatus != 0
+      STDERR.puts("Error building #{pkg}")
+      exit($?.exitstatus)
+    end
   end
 end