From d80661d425e7a17dfcfadad0bfc45f88d5271213 Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <z@kochan.io>
Date: Tue, 28 Feb 2023 03:53:38 +0200
Subject: [PATCH] fix(setup): don't extend the PATH multiple times

ref https://github.com/pnpm/get.pnpm.io/issues/27
---
 .changeset/breezy-masks-cross.md            | 23 +++++++++++++++++++++
 packages/plugin-commands-setup/package.json |  2 +-
 pnpm-lock.yaml                              | 16 +++++++-------
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/breezy-masks-cross.md

diff --git a/.changeset/breezy-masks-cross.md b/.changeset/breezy-masks-cross.md
new file mode 100644
index 000000000..2e2b01298
--- /dev/null
+++ b/.changeset/breezy-masks-cross.md
@@ -0,0 +1,23 @@
+---
+"@pnpm/plugin-commands-setup": patch
+"pnpm": patch
+---
+
+The configuration added by `pnpm setup` should check if the pnpm home directory is already in the PATH before adding to the PATH.
+
+Before this change, this code was added to the shell:
+
+```sh
+export PNPM_HOME="$HOME/Library/pnpm"
+export PATH="$PNPM_HOME:$PATH"
+```
+
+Now this will be added:
+
+```sh
+export PNPM_HOME="$HOME/Library/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+```
diff --git a/packages/plugin-commands-setup/package.json b/packages/plugin-commands-setup/package.json
index 6cafa8369..561ccb7b6 100644
--- a/packages/plugin-commands-setup/package.json
+++ b/packages/plugin-commands-setup/package.json
@@ -31,7 +31,7 @@
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-setup#readme",
   "dependencies": {
     "@pnpm/cli-utils": "workspace:*",
-    "@pnpm/os.env.path-extender": "^0.2.9",
+    "@pnpm/os.env.path-extender": "^0.2.10",
     "render-help": "^1.0.3"
   },
   "funding": "https://opencollective.com/pnpm",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e31170c8..bd53a432f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2401,8 +2401,8 @@ importers:
         specifier: ^5.0.0
         version: 5.0.0
       '@pnpm/os.env.path-extender':
-        specifier: ^0.2.9
-        version: 0.2.9
+        specifier: ^0.2.10
+        version: 0.2.10
       render-help:
         specifier: ^1.0.3
         version: 1.0.3
@@ -8144,8 +8144,8 @@ packages:
       - domexception
     dev: true
 
-  /@pnpm/os.env.path-extender-posix@0.2.7:
-    resolution: {integrity: sha512-C6mMlHqvRzogLIQyvmsWl5QZFNEBNl2/ED5BisBSUQcUZyv/UVcJ0Soo/POv8Dc1D3zDeq+tsZ9esIhc983Umg==}
+  /@pnpm/os.env.path-extender-posix@0.2.8:
+    resolution: {integrity: sha512-otEKICb9/rHir3rf9MoUBfFkwNRzPwHCS5XdABPA1h9fhl6tGH1e5ZDJeTQ+ZEil5bZazQsn68/WRqI9okt4+A==}
     engines: {node: '>=12.22.0'}
     dependencies:
       '@pnpm/error': 4.0.1
@@ -8160,11 +8160,11 @@ packages:
       string.prototype.matchall: 4.0.7
     dev: false
 
-  /@pnpm/os.env.path-extender@0.2.9:
-    resolution: {integrity: sha512-25qVItKsOsxBh5UU+QqDaY7GGiqENoZYMitoYdQviVLH3OQU9iRzR/O0kuYBHg5Uv1DuEsTydxUaHwt4P4SahA==}
+  /@pnpm/os.env.path-extender@0.2.10:
+    resolution: {integrity: sha512-GDZtPLP+uxI/tx9hNW9JnWsXWa4KErf1UBVYqU5utYZQ4AigrSgLwGmMkrQCs8BbaP/0Jnwhjb4JfBwNxKGJ3w==}
     engines: {node: '>=12.22.0'}
     dependencies:
-      '@pnpm/os.env.path-extender-posix': 0.2.7
+      '@pnpm/os.env.path-extender-posix': 0.2.8
       '@pnpm/os.env.path-extender-windows': 0.2.4
     dev: false
 
@@ -17465,7 +17465,7 @@ time:
   /@pnpm/npm-conf@2.0.4: '2022-11-11T20:26:48.028Z'
   /@pnpm/npm-lifecycle@2.0.0: '2022-11-30T19:58:42.868Z'
   /@pnpm/npm-package-arg@1.0.0: '2022-06-28T12:48:31.287Z'
-  /@pnpm/os.env.path-extender@0.2.9: '2023-01-31T02:04:06.460Z'
+  /@pnpm/os.env.path-extender@0.2.10: '2023-02-28T01:46:02.862Z'
   /@pnpm/ramda@0.28.1: '2022-08-03T13:56:59.597Z'
   /@pnpm/registry-mock@3.4.0: '2023-02-08T00:47:00.662Z'
   /@pnpm/semver-diff@1.1.0: '2021-11-16T12:40:59.941Z'