Merge pull request #5108 from wanzzhehe/master

Fix adding duplicate paths to PATH during installation
xmake-io · May 16, 2024 · fdb3168 · fdb3168
2 parents 95f8740 + b3f9bd3
commit fdb3168
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/scripts/get.sh b/scripts/get.sh
@@ -237,7 +237,7 @@ fi
 #
 install_profile() {
     export XMAKE_ROOTDIR="$prefix/bin"
-    export PATH="$XMAKE_ROOTDIR:$PATH"
+    [[ "$PATH" =~ (^|:)"$XMAKE_ROOTDIR"(:|$) ]] || export PATH="$XMAKE_ROOTDIR:$PATH"
     xmake --version
     xmake update --integrate
 }

diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
@@ -318,7 +318,7 @@ function _initialize_shell()
         local profile_fish = "$XMAKE_PROGRAM_DIR/scripts/profile-unix.fish"
         local bridge_command = format([[export XMAKE_ROOTDIR="%s"
 export XMAKE_PROGRAM_DIR="%s"
-export PATH="$XMAKE_ROOTDIR:$PATH"
+# export PATH="$XMAKE_ROOTDIR:$PATH"
 test $FISH_VERSION && test -f "%s" && source "%s" && exit 0
 test -f "%s" && source "%s"
 ]], path.directory(os.programfile()), os.programdir(), profile_fish, profile_fish, profile, profile)

diff --git a/xmake/scripts/profile-unix.fish b/xmake/scripts/profile-unix.fish
@@ -18,6 +18,10 @@
 # @homepage    profile-unix.fish
 #
 
+# register PATH
+string match --regex --quiet "(^|:)$XMAKE_ROOTDIR(:|\$)" "$PATH" || \
+    export PATH="$XMAKE_ROOTDIR:$PATH"
+
 # register environments
 export XMAKE_SHELL=fish
 

diff --git a/xmake/scripts/profile-unix.sh b/xmake/scripts/profile-unix.sh
@@ -18,6 +18,9 @@
 # @homepage    profile-unix.sh
 #
 
+# register PATH
+[[ "$PATH" =~ (^|:)"$XMAKE_ROOTDIR"(:|$) ]] || export PATH="$XMAKE_ROOTDIR:$PATH"
+
 # register completions
 if   [[ -n "$ZSH_VERSION" ]]; then
   export XMAKE_SHELL=zsh