From 24ef35fc11ff84f27adaa3ff655e276a2e5aab15 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Thu, 25 Apr 2024 01:46:22 -0300
Subject: [PATCH] Fix deploy tasks

---
 host/rake/lib/builders.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/host/rake/lib/builders.rb b/host/rake/lib/builders.rb
index a97273c..cbd9afb 100644
--- a/host/rake/lib/builders.rb
+++ b/host/rake/lib/builders.rb
@@ -39,7 +39,7 @@ class Copy < Builder
       mkdir_p(dest)
       if _1 == PARENT
         sh "cp -fv *.gemspec #{dest}"
-        sh "cp -Rfv lib/ #{dest}"
+        sh "cp -Rfv host/lib/ #{dest}"
       else
         sh [
           "find #{_1}",
@@ -72,9 +72,10 @@ class Build < Builder
   def call(version)
     dest = File.join(PKGDIR, version)
     mkdir_p(dest)
-    [*CHILDREN, PARENT].each do |gem|
-      Dir.chdir(File.join(STAGEDIR, version, gem)) do
-        sh "gem build #{gem}.gemspec"
+    [*CHILDREN.map { "#{PARENT}-#{_1}" }, PARENT].each do |gem|
+      stagedir = File.join(STAGEDIR, version, gem.sub(/^#{Regexp.escape(PARENT)}-/, ""))
+      Dir.chdir(stagedir) do
+        sh "gem build #{File.basename(stagedir)}.gemspec"
         sh "mv #{gem}-#{version}.gem #{dest}"
       end
     end
@@ -84,7 +85,7 @@ end
 class Deploy < Builder
   def call(version)
     Dir.chdir File.join(PKGDIR, version) do
-      [*CHILDREN, PARENT].each do |gem|
+      [*CHILDREN.map { "#{PARENT}-#{_1}" }, PARENT].each do |gem|
         sh "gem push #{gem}-#{version}.gem"
       end
     end