From 8e08d050a9397ae40a9127618f163a60639c0ede Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Thu, 19 Aug 2021 16:04:22 +0200 Subject: Fix install/uninstall output when using --admin --- xmake/actions/install/install_admin.lua | 5 +++++ xmake/actions/install/main.lua | 2 +- xmake/actions/uninstall/main.lua | 2 +- xmake/actions/uninstall/uninstall_admin.lua | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xmake/actions/install/install_admin.lua b/xmake/actions/install/install_admin.lua index 1f0103d27..594562505 100644 --- a/xmake/actions/install/install_admin.lua +++ b/xmake/actions/install/install_admin.lua @@ -28,6 +28,8 @@ import("install") -- install function main(targetname, installdir, prefix) + local verbose = option.get("verbose") + -- enter project directory os.cd(project.directory()) @@ -40,6 +42,9 @@ function main(targetname, installdir, prefix) -- save the current option and push a new option context option.save() + -- preserve verbose option + option.set("verbose", option) + -- pass installdir to option if installdir then option.set("installdir", installdir) diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua index 40ba15cc3..febae713b 100644 --- a/xmake/actions/install/main.lua +++ b/xmake/actions/install/main.lua @@ -110,7 +110,7 @@ function main() if sudo.has() and option.get("admin") then -- install target with administrator permission - sudo.runl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or (option.get("all") and "__all" or "__def"), option.get("installdir"), option.get("prefix")}) + sudo.execl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or (option.get("all") and "__all" or "__def"), option.get("installdir"), option.get("prefix")}) cprint("${color.success}install ok!") ok = true end diff --git a/xmake/actions/uninstall/main.lua b/xmake/actions/uninstall/main.lua index eedde054e..3e6769c24 100644 --- a/xmake/actions/uninstall/main.lua +++ b/xmake/actions/uninstall/main.lua @@ -81,7 +81,7 @@ function main() if sudo.has() and option.get("admin") then -- uninstall target with administrator permission - sudo.runl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", option.get("installdir"), option.get("prefix")}) + sudo.execl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", option.get("installdir"), option.get("prefix")}) -- trace cprint("${color.success}uninstall ok!") diff --git a/xmake/actions/uninstall/uninstall_admin.lua b/xmake/actions/uninstall/uninstall_admin.lua index c30a16a01..5430a3e76 100644 --- a/xmake/actions/uninstall/uninstall_admin.lua +++ b/xmake/actions/uninstall/uninstall_admin.lua @@ -28,6 +28,8 @@ import("uninstall") -- uninstall function main(targetname, installdir, prefix) + local verbose = option.get("verbose") + -- enter project directory os.cd(project.directory()) @@ -40,6 +42,9 @@ function main(targetname, installdir, prefix) -- save the current option and push a new option context option.save() + -- preserve verbose option + option.set("verbose", option) + -- pass installdir to option if installdir then option.set("installdir", installdir) -- cgit v1.3.1 From 63e0022eaa60b02f5215a8792a54a6cdddc61619 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Thu, 19 Aug 2021 16:47:08 +0200 Subject: Fix mistake --- xmake/actions/install/install_admin.lua | 2 +- xmake/actions/uninstall/uninstall_admin.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/actions/install/install_admin.lua b/xmake/actions/install/install_admin.lua index 594562505..c2b57f05d 100644 --- a/xmake/actions/install/install_admin.lua +++ b/xmake/actions/install/install_admin.lua @@ -43,7 +43,7 @@ function main(targetname, installdir, prefix) option.save() -- preserve verbose option - option.set("verbose", option) + option.set("verbose", verbose) -- pass installdir to option if installdir then diff --git a/xmake/actions/uninstall/uninstall_admin.lua b/xmake/actions/uninstall/uninstall_admin.lua index 5430a3e76..f597dea11 100644 --- a/xmake/actions/uninstall/uninstall_admin.lua +++ b/xmake/actions/uninstall/uninstall_admin.lua @@ -43,7 +43,7 @@ function main(targetname, installdir, prefix) option.save() -- preserve verbose option - option.set("verbose", option) + option.set("verbose", verbose) -- pass installdir to option if installdir then -- cgit v1.3.1