translate path

xmake-io · Dec 21, 2023 · e7e4a16 · e7e4a16
1 parent 6417898
commit e7e4a16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/xmake/plugins/pack/batchcmds.lua b/xmake/plugins/pack/batchcmds.lua
@@ -192,7 +192,7 @@ end
 -- on build target command
 function _on_target_buildcmd(target, batchcmds_, opt)
     local package = opt.package
-    batchcmds_:vrunv("xmake", {"build", target:name()})
+    batchcmds_:vrunv("xmake", {"build", "-y", target:name()})
 end
 
 -- on install target command

diff --git a/xmake/plugins/pack/srpm/main.lua b/xmake/plugins/pack/srpm/main.lua
@@ -99,8 +99,16 @@ function _get_customcmd(package, installcmds, cmd)
         local dir = _translate_filepath(package, cmd.dir)
         table.insert(installcmds, string.format("mkdir -p \"%s\"", dir))
     elseif cmd.program then
-        -- TODO translate path
-        table.insert(installcmds, string.format("%s", os.args(table.join(cmd.program, cmd.argv))))
+        local argv = {}
+        for _, arg in ipairs(cmd.argv) do
+            if path.instance_of(arg) then
+                arg = arg:clone():set(_translate_filepath(package, arg:rawstr())):str()
+            elseif path.is_absolute(arg) then
+                arg = _translate_filepath(package, arg)
+            end
+            table.insert(argv, arg)
+        end
+        table.insert(installcmds, string.format("%s", os.args(table.join(cmd.program, argv))))
     end
 end