rename init to integrate

3 files changed, 63 insertions, 8 deletions

diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index d729a2987..59fe40d36 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -34,6 +34,7 @@ import("private.action.require.impl.environment")
 import("private.action.update.fetch_version")
 import("utils.archive")
 import("lib.detect.find_file")
+import("lib.detect.find_tool")
 
 -- the installer filename for windows
 local win_installer_name = "xmake-installer.exe"
@@ -286,7 +287,8 @@ function _initialize_shell()
 
     local target, command, profile
     if is_host("windows") then
-        local psshell = os.iorun("pwsh -v") and "pwsh" or "powershell"
+        local pwsh = find_tool("pwsh")
+        local psshell = pwsh and "pwsh" or "powershell"
         local outdata, errdata = os.iorunv(psshell, {"-c", "Write-Output $PROFILE.CurrentUserAllHosts"})
         if outdata then
             target = outdata:trim()
@@ -296,13 +298,12 @@ function _initialize_shell()
             raise("failed to get profile location from powershell!")
         end
     else
+        target = "~/.profile"
         local shell = os.shell()
-        local filename = ".profile"
-        if shell:endswith("bash") then filename = (is_host("macosx") and ".bash_profile" or ".bashrc")
-        elseif shell:endswith("zsh") then filename = ".zshrc"
-        elseif shell:endswith("ksh") then filename = ".kshrc"
+        if shell:endswith("bash") then target = (is_host("macosx") and "~/.bash_profile" or "~/.bashrc")
+        elseif shell:endswith("zsh") then target = "~/.zshrc"
+        elseif shell:endswith("ksh") then target = "~/.kshrc"
         end
-        target = path.join(os.getenv("HOME"), filename)
         command = "[[ -s \"%s\" ]] && source \"%s\""
         profile = path.join(os.programdir(), "scripts", "profile-unix.sh")
     end
@@ -382,7 +383,7 @@ function main()
     end
 
     -- initialize for shell interaction
-    if option.get("init") then
+    if option.get("integrate") then
         _initialize_shell()
         return
     end
diff --git a/xmake/actions/update/xmake.lua b/xmake/actions/update/xmake.lua
index 8c3b1f33b..4a366fb92 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."                                     }
-                ,   {'i', "init",        "k",   nil,    "Initialize xmake for shell interaction."                  }
+                ,   {nil, "integrate",   "k",   nil,    "Initialize xmake for shell interaction."                  }
                 ,   {'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_pwsh.lua b/xmake/modules/detect/tools/find_pwsh.lua
new file mode 100644
index 000000000..4b42ad8bf
--- /dev/null
+++ b/xmake/modules/detect/tools/find_pwsh.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_pwsh.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find pwsh
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local pwsh = find_pwsh()
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt         = opt or {}
+    opt.command = opt.command or "--version"
+
+    -- find program
+    local program = find_program(opt.program or "pwsh", 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