Write the full path of the dotnet tools directory in /etc/paths.d/dotnet-cli-tools

src/Cli/dotnet/CommonLocalizableStrings.resx

@@ -566,22 +566,6 @@ EOF
 
 You can add it to the current session by running the following command:
 
-export PATH="$PATH:{0}"
-</value>
-  </data>
-  <data name="EnvironmentPathOSXZshManualInstructions" xml:space="preserve">
-    <value>Tools directory '{0}' is not currently on the PATH environment variable.
-If you are using zsh, you can add it to your profile by running the following command:
-
-cat &lt;&lt; \EOF &gt;&gt; ~/.zprofile
-# Add .NET Core SDK tools
-export PATH="$PATH:{0}"
-EOF
-
-And run `zsh -l` to make it available for current session.
-
-You can only add it to the current session by running the following command:
-
 export PATH="$PATH:{0}"
 </value>
   </data>

src/Cli/dotnet/ShellShim/EnvironmentPathFactory.cs

@@ -46,7 +46,7 @@ public static IEnvironmentPath CreateEnvironmentPath(
             }
             else if (OperatingSystem.IsMacOS() && isDotnetBeingInvokedFromNativeInstaller)
             {
-                environmentPath = new OsxBashEnvironmentPath(
+                environmentPath = new OsxEnvironmentPath(
                     executablePath: CliFolderPathCalculator.ToolsShimPathInUnix,
                     reporter: Reporter.Output,
                     environmentProvider: environmentProvider,
@@ -64,14 +64,6 @@ public static IEnvironmentPathInstruction CreateEnvironmentPathInstruction(
                 environmentProvider = new EnvironmentProvider();
             }
 
-            if (OperatingSystem.IsMacOS() && ZshDetector.IsZshTheUsersShell(environmentProvider))
-            {
-                return new OsxZshEnvironmentPathInstruction(
-                    executablePath: CliFolderPathCalculator.ToolsShimPathInUnix,
-                    reporter: Reporter.Output,
-                    environmentProvider: environmentProvider);
-            }
-
             if (OperatingSystem.IsWindows())
             {
                 return new WindowsEnvironmentPath(

src/Cli/dotnet/ShellShim/OsxBashEnvironmentPath.cs → src/Cli/dotnet/ShellShim/OsxEnvironmentPath.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.ShellShim
 {
-    internal class OsxBashEnvironmentPath : IEnvironmentPath
+    internal class OsxEnvironmentPath : IEnvironmentPath
     {
         private const string PathName = "PATH";
         private readonly BashPathUnderHomeDirectory _packageExecutablePath;
@@ -20,7 +20,7 @@ internal static readonly string DotnetCliToolsPathsDPath
             = Environment.GetEnvironmentVariable("DOTNET_CLI_TEST_OSX_PATHSD_PATH")
               ?? @"/etc/paths.d/dotnet-cli-tools";
 
-        public OsxBashEnvironmentPath(
+        public OsxEnvironmentPath(
             BashPathUnderHomeDirectory executablePath,
             IReporter reporter,
             IEnvironmentProvider environmentProvider,
@@ -42,7 +42,7 @@ public void AddPackageExecutablePathToUserPath()
                 return;
             }
 
-            _fileSystem.WriteAllText(DotnetCliToolsPathsDPath, _packageExecutablePath.PathWithTilde);
+            _fileSystem.WriteAllText(DotnetCliToolsPathsDPath, _packageExecutablePath.Path);
         }
 
         private bool PackageExecutablePathExists()