|
@@ -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")
|
|
|
|
- os.vrunv(uname, {"-a"})
|
|
|
|
|
|
+ local bash = path.join(package:installdir("usr/bin"), "bash.exe")
|
|
|
|
+ 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(pacman, {"-Syuu", "--overwrite", "*"}) end}
|
|
|
|
|
|
+ try { function () os.vrunv(bash, {"-leo", "pipefail", "-c", "pacman --noconfirm -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)
|