Merge pull request #11349 from davidxia/fish-path

fix: use recommended way of updating Fish shell $PATH
Homebrew · May 11, 2021 · f35bb42 · f35bb42
2 parents fca0fb1 + 7920006
commit f35bb42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Library/Homebrew/test/utils/shell_spec.rb b/Library/Homebrew/test/utils/shell_spec.rb
@@ -98,7 +98,7 @@
       ENV["SHELL"] = "/usr/local/bin/fish"
       ENV["fish_user_paths"] = "/some/path"
       expect(described_class.prepend_path_in_profile(path))
-        .to eq("echo 'set -g fish_user_paths \"#{path}\" $fish_user_paths' >> #{shell_profile}")
+        .to eq("echo 'fish_add_path #{path}' >> #{shell_profile}")
     end
   end
 end
diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb
@@ -78,7 +78,7 @@ def prepend_path_in_profile(path)
       when :csh, :tcsh
         "echo 'setenv PATH #{csh_quote(path)}:$PATH' >> #{profile}"
       when :fish
-        "echo 'set -g fish_user_paths \"#{sh_quote(path)}\" $fish_user_paths' >> #{profile}"
+        "echo 'fish_add_path #{sh_quote(path)}' >> #{profile}"
       end
     end