improve to find powershell

3 files changed, 63 insertions, 7 deletions

diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index 59fe40d36..8d4f4b582 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -113,9 +113,12 @@ function _uninstall()
     if is_host("windows") then
         for _, shell in ipairs({"pwsh", "powershell"}) do
             for _, type in ipairs({"AllUsersAllHosts", "CurrentUserAllHosts", "CurrentUserCurrentHost"}) do
-                local outdata, errdata = os.iorunv(shell, {"-c", "Write-Output $PROFILE." .. type})
-                if outdata then
-                    table.insert(profiles, outdata:trim())
+                local psshell = find_tool(shell)
+                if psshell then
+                    local outdata, errdata = try {function () return os.iorunv(shell, {"-c", "Write-Output $PROFILE." .. type}) end}
+                    if outdata then
+                        table.insert(profiles, outdata:trim())
+                    end
                 end
             end
         end
@@ -287,9 +290,8 @@ function _initialize_shell()
 
     local target, command, profile
     if is_host("windows") then
-        local pwsh = find_tool("pwsh")
-        local psshell = pwsh and "pwsh" or "powershell"
-        local outdata, errdata = os.iorunv(psshell, {"-c", "Write-Output $PROFILE.CurrentUserAllHosts"})
+        local psshell = find_tool("pwsh") or find_tool("powershell")
+        local outdata, errdata = try {function () return os.iorunv(psshell.program, {"-c", "Write-Output $PROFILE.CurrentUserAllHosts"}) end}
         if outdata then
             target = outdata:trim()
             command = "if (Test-Path -Path \"%s\" -PathType Leaf) {\n    . \"%s\"\n}"
diff --git a/xmake/actions/update/xmake.lua b/xmake/actions/update/xmake.lua
index 4a366fb92..e7a074024 100644
--- a/xmake/actions/update/xmake.lua
+++ b/xmake/actions/update/xmake.lua
@@ -41,7 +41,7 @@ task("update")
                     {nil, "uninstall",   "k",   nil,    "Uninstall the current xmake program."                     }
                 ,   {                                                                                              }
                 ,   {'s', "scriptonly",  "k",   nil,    "Update scripts only."                                     }
-                ,   {nil, "integrate",   "k",   nil,    "Initialize xmake for shell interaction."                  }
+                ,   {nil, "integrate",   "k",   nil,    "Integrate xmake with default shell."                  }
                 ,   {'f', "force",       "k",   nil,    "Force to update and reinstall the given version."         }
                 ,   {nil, "xmakever",    "v",   nil,    "The given xmake version, or a git source (and branch). ",
                                                         "e.g.",
diff --git a/xmake/modules/detect/tools/find_powershell.lua b/xmake/modules/detect/tools/find_powershell.lua
new file mode 100644
index 000000000..78cb35afd
--- /dev/null
+++ b/xmake/modules/detect/tools/find_powershell.lua
@@ -0,0 +1,54 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      xq114
+-- @file        find_powershell.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find powershell
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local powershell = find_powershell()
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt         = opt or {}
+    opt.command = opt.command or "--version"
+
+    -- find program
+    local program = find_program(opt.program or "powershell", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt and opt.version then
+        version = find_programver(program, opt)
+    end
+
+    -- ok?
+    return program, version
+end