improve git/7zip packages

2 files changed, 11 insertions, 7 deletions

diff --git a/xmake/repository/packages/7/7z/xmake.lua b/xmake/repository/packages/7/7z/xmake.lua
index b3edea725..313f5e434 100644
--- a/xmake/repository/packages/7/7z/xmake.lua
+++ b/xmake/repository/packages/7/7z/xmake.lua
@@ -4,7 +4,7 @@ package("7z")
     set_homepage("https://www.7-zip.org/")
     set_description("A file archiver with a high compression ratio.")
 
-    if os.host() == "windows" then
+    if is_host("windows") then
         if os.arch() == "x64" then
             set_urls("https://github.com/xmake-mirror/7zip/releases/download/$(version)/7z$(version)-x64.zip",
                      "https://gitlab.com/xmake-mirror/7zip-releases/raw/master/7z$(version)-x64.zip")
@@ -25,13 +25,15 @@ package("7z")
         add_versions("github:16.02", "1cb98f266f8f6109d99d35473dfc8db71a9933b1dea58a89833650858e504b52")
         add_versions("gitlab:16.02", "93c6a14efb6dc9ee2fbb8c8fd4b5f319537c98182f8810f3b25cfa6363d9905b")
     end
+    set_plat(os.host())
+    set_arch(os.arch())
 
-    on_install("@macosx", "@linux", function (package)
+    on_install("macosx", "linux", function (package)
         os.vrun("make 7z")
         os.cp("bin", package:installdir())
     end)
 
-    on_install("@windows", "@msys", "@cygwin", function (package)
+    on_install("windows", function (package)
         os.cp("*", package:installdir("bin"))
     end)
 
diff --git a/xmake/repository/packages/g/git/xmake.lua b/xmake/repository/packages/g/git/xmake.lua
index 8833ce20c..df9fb6668 100644
--- a/xmake/repository/packages/g/git/xmake.lua
+++ b/xmake/repository/packages/g/git/xmake.lua
@@ -4,7 +4,7 @@ package("git")
     set_homepage("https://git-scm.com/")
     set_description("A free and open source distributed version control system")
 
-    if os.host() == "windows" then
+    if is_host("windows") then
         if os.arch() == "x64" then
             add_urls("https://github.com/git-for-windows/git/releases/download/v$(version).windows.1/MinGit-$(version)-64-bit.zip",
                      "https://gitlab.com/xmake-mirror/git-for-windows-releases/raw/master/MinGit-$(version)-64-bit.zip")
@@ -23,17 +23,19 @@ package("git")
             end
         end
     end
+    set_plat(os.host())
+    set_arch(os.arch())
 
-    on_load("@windows", "@msys", "@cygwin", function (package)
+    on_load("windows", function (package)
         package:addenv("PATH", path.join("share", "MinGit", "mingw32", "bin"))
         package:addenv("PATH", path.join("share", "MinGit", "cmd"))
     end)
 
-    on_install("@macosx", "@linux", function (package)
+    on_install("macosx", "linux", function (package)
         import("package.manager.install_package")("git")
     end)
 
-    on_install("@windows", "@msys", "@cygwin", function (package)
+    on_install("windows", function (package)
         os.cp("*", package:installdir("share/MinGit"))
     end)