Merge pull request #2816 from ckipp01/fixFish

fix: fix fish config location when XDG_CONFIG_HOME is used
coursier · Aug 3, 2023 · 8d93005 · 8d93005
2 parents 3e212b4 + af26e0a
commit 8d93005
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/modules/env/src/main/scala/coursier/env/ProfileUpdater.scala b/modules/env/src/main/scala/coursier/env/ProfileUpdater.scala
@@ -20,9 +20,8 @@ import java.nio.file.FileSystemException
       case Some(Shell.Fish) =>
         val fishConfig = getEnv.flatMap(_("XDG_CONFIG_HOME"))
           .map(Paths.get(_))
-          .orElse(home)
-          .toSeq
-          .map(_.resolve(".config/fish/config.fish"))
+          .map(_.resolve("fish/config.fish"))
+          .fold(home.map(_.resolve(".config/fish/config.fish")).toSeq)(Seq(_))
 
         fishConfig