improve package:script()

1 files changed, 8 insertions, 24 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 9ddef427d..799776582 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -671,45 +671,29 @@ function _instance:script(name, generic)
         local plat = self:plat() or ""
         local arch = self:arch() or ""
 
-        -- match script for special plat and arch
-        local pattern = plat .. '|' .. arch
+        -- match pattern
+        --
+        -- `@macosx,linux`
+        -- `android@macosx,linux`
+        -- `android|armv7-a@macosx,linux`
+        --
         for _pattern, _script in pairs(script) do
             local hosts = {}
             local hosts_spec = false
             _pattern = _pattern:gsub("@(.+)", function (v) 
-                -- get and remove hosts for `android|armv7-a@macosx,linux`
                 for _, host in ipairs(v:split(',')) do
                     hosts[host] = true
                     hosts_spec = true
                 end
                 return "" 
             end)
-            if not _pattern:startswith("__") and pattern:find('^' .. _pattern .. '$') and (not hosts_spec or hosts[os.host()]) then
+            if not _pattern:startswith("__") and (not hosts_spec or hosts[os.host()])  
+            and (_pattern:trim() == "" or (plat .. '|' .. arch):find('^' .. _pattern .. '$') or plat:find('^' .. _pattern .. '$')) then
                 result = _script
                 break
             end
         end
 
-        -- match script for special plat
-        if result == nil then
-            for _pattern, _script in pairs(script) do
-                local hosts = {}
-                local hosts_spec = false
-                _pattern = _pattern:gsub("@(.+)", function (v) 
-                    -- get and remove hosts for `android@macosx,linux`
-                    for _, host in ipairs(v:split(',')) do
-                        hosts[host] = true
-                        hosts_spec = true
-                    end
-                    return "" 
-                end)
-                if not _pattern:startswith("__") and plat:find('^' .. _pattern .. '$') and (not hosts_spec or hosts[os.host()]) then
-                    result = _script
-                    break
-                end
-            end
-        end
-
         -- get generic script
         result = result or script["__generic__"] or generic
     end