diff options
Diffstat (limited to 'xmake/actions/uninstall/main.lua')
| -rw-r--r-- | xmake/actions/uninstall/main.lua | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/xmake/actions/uninstall/main.lua b/xmake/actions/uninstall/main.lua index 25ecf70d9..1a2a80577 100644 --- a/xmake/actions/uninstall/main.lua +++ b/xmake/actions/uninstall/main.lua @@ -30,26 +30,6 @@ import("core.base.privilege") import("privilege.sudo") import("uninstall") --- get install directory -function _installdir() - - -- the install directory - -- - -- DESTDIR: be compatible with https://www.gnu.org/prep/standards/html_node/DESTDIR.html - -- - local installdir = option.get("installdir") or os.getenv("INSTALLDIR") or os.getenv("DESTDIR") or platform.get("installdir") - assert(installdir, "unknown install directory!") - - -- append prefix - local prefix = option.get("prefix") or os.getenv("PREFIX") - if prefix then - installdir = path.join(installdir, prefix) - end - - -- ok - return installdir -end - -- main function main() @@ -59,19 +39,13 @@ function main() -- config it first task.run("config", {target = targetname, require = "n"}) - -- get install directory - local installdir = _installdir() - - -- trace - print("uninstalling from %s ...", installdir) - -- attempt to uninstall directly try { function () -- uninstall target - uninstall(targetname, installdir) + uninstall(targetname) -- trace cprint("${bright}uninstall ok!${clear}${ok_hand}") @@ -89,7 +63,7 @@ function main() function () -- uninstall target - uninstall(targetname, installdir) + uninstall(targetname) -- trace cprint("${bright}uninstall ok!${clear}${ok_hand}") @@ -132,7 +106,7 @@ function main() if confirm then -- uninstall target with administrator permission - sudo.runl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", installdir}) + sudo.runl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", option.get("installdir"), option.get("prefix")}) -- trace cprint("${bright}uninstall ok!${clear}${ok_hand}") |