diff options
| author | ruki <[email protected]> | 2020-09-15 22:56:11 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-15 22:56:11 +0800 |
| commit | edb94735dc313f04af34bf1fe4c866e41de355de (patch) | |
| tree | 11608b3388175b3a2ccae2221fa6512ae64d319c /xmake/actions/install/main.lua | |
| parent | 6860d9c30b71ff3492c33f889e159ebabda81c29 (diff) | |
improve install and uninstall
Diffstat (limited to 'xmake/actions/install/main.lua')
| -rw-r--r-- | xmake/actions/install/main.lua | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua index 48f92c70f..3a9abb1c7 100644 --- a/xmake/actions/install/main.lua +++ b/xmake/actions/install/main.lua @@ -116,19 +116,14 @@ function main() -- continue to install with administrator permission? local ok = false - if sudo.has() then + if sudo.has() and option.get("admin") then - -- confirm to install? - local confirm = utils.confirm({default = true, description = "try continue to install with administrator permission again"}) - if confirm then + -- install target with administrator permission + sudo.runl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or ifelse(option.get("all"), "__all", "__def"), option.get("installdir"), option.get("prefix")}) - -- install target with administrator permission - sudo.runl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or ifelse(option.get("all"), "__all", "__def"), option.get("installdir"), option.get("prefix")}) - - -- trace - cprint("${color.success}install ok!") - ok = true - end + -- trace + cprint("${color.success}install ok!") + ok = true end assert(ok, "install failed, %s", errors or "unknown reason") end |