fix install

msys2
ruki 9 months ago
parent 90d91f8718
commit 21cb588cc0
  1. 9
      packages/m/msys2-base/xmake.lua
  2. 6
      packages/m/msys2/xmake.lua

@ -20,18 +20,17 @@ package("msys2-base")
package:addenv("PATH", "usr/bin") package:addenv("PATH", "usr/bin")
-- starting MSYS2 for the first time -- starting MSYS2 for the first time
local uname = path.join(package:installdir("usr/bin"), "uname.exe") local bash = path.join(package:installdir("usr/bin"), "bash.exe")
os.vrunv(uname, {"-a"}) os.vrunv(bash, {"-leo", "pipefail", "-c", "uname -a"})
-- updating packages -- updating packages
local pacman = path.join(package:installdir("usr/bin"), "pacman.exe") try { function () os.vrunv(bash, {"-leo", "pipefail", "-c", "pacman --noconfirm -Syuu --overwrite *"}) end}
try { function () os.vrunv(pacman, {"-Syuu", "--overwrite", "*"}) end}
-- killing remaining tasks -- killing remaining tasks
os.vrunv("taskkill", {"/F", "/FI", "MODULES eq msys-2.0.dll"}) os.vrunv("taskkill", {"/F", "/FI", "MODULES eq msys-2.0.dll"})
-- final system upgrade -- final system upgrade
os.vrunv(pacman, {"-Syuu", "--overwrite", "*"}) os.vrunv(bash, {"-leo", "pipefail", "-c", "pacman --noconfirm -Syuu --overwrite *"})
end) end)
on_test(function (package) on_test(function (package)

@ -12,12 +12,12 @@ package("msys2")
local msystem = package:config("msystem") local msystem = package:config("msystem")
if msystem then if msystem then
package:addenv("MSYSTEM", msystem) package:addenv("MSYSTEM", msystem)
local pacman = path.join(msys2_base:installdir("usr/bin"), "pacman.exe") local bash = path.join(msys2_base:installdir("usr/bin"), "bash.exe")
if msystem == "MINGW64" then if msystem == "MINGW64" then
os.vrunv(pacman, {"--noconfirm", "-S", "--needed", "--overwrite", "*", "mingw-w64-x86_64-toolchain"}) os.vrunv(bash, {"-leo", "pipefail", "-c", "pacman --noconfirm -S --needed --overwrite * mingw-w64-x86_64-toolchain"})
package:addenv("PATH", msys2_base:installdir("mingw64/bin")) package:addenv("PATH", msys2_base:installdir("mingw64/bin"))
elseif msystem == "MINGW32" then elseif msystem == "MINGW32" then
os.vrunv(pacman, {"--noconfirm", "-S", "--needed", "--overwrite", "*", "mingw-w64-i686-toolchain"}) os.vrunv(bash, {"-leo", "pipefail", "-c", "pacman --noconfirm -S --needed --overwrite * mingw-w64-i686-toolchain"})
package:addenv("PATH", msys2_base:installdir("mingw32/bin")) package:addenv("PATH", msys2_base:installdir("mingw32/bin"))
end end
end end

Loading…
Cancel
Save