generate the powershell add_to_PATH.ps1

fsprojects · Jan 4, 2018 · 7e3193f · 7e3193f
1 parent 125ac1c
commit 7e3193f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/integrationtests/Paket.IntegrationTests/RepoToolSpecs.fs b/integrationtests/Paket.IntegrationTests/RepoToolSpecs.fs
@@ -68,11 +68,9 @@ let ``#3003 repo tool with add to PATH``() =
 
     let wrappersPath = Path.Combine(scenarioTempPath scenario, "paket-files", "bin")
 
-    let helloCmdPath = Path.Combine(wrappersPath, "add_to_PATH.cmd")
-    Assert.IsTrue(File.Exists(helloCmdPath), (sprintf "file '%s' not found" helloCmdPath))
-
-    let helloBashPath = Path.Combine(wrappersPath, "add_to_PATH.sh")
-    Assert.IsTrue(File.Exists(helloBashPath), (sprintf "file '%s' not found" helloBashPath))
+    for name in ["add_to_PATH.cmd"; "add_to_PATH.sh"; "add_to_PATH.ps1"] do
+        let cmdPath = Path.Combine(wrappersPath, name)
+        Assert.IsTrue(File.Exists(cmdPath), (sprintf "file '%s' not found" cmdPath))
 
 [<Test>]
 let ``#3004 repo tool multi tfm (net)``() =

diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs
@@ -429,6 +429,8 @@ let CreateToolWrapperForGroups (lockFile:LockFile) (groups:Map<GroupName,LockFil
                      script.Save
                 | RepoTools.WrapperToolGeneration.ScriptContent.ShellAddToPATH script ->
                      script.Save
+                | RepoTools.WrapperToolGeneration.ScriptContent.PowershellAddToPATH script ->
+                     script.Save
             saveScript rootPath |> ignore
 
 let FindOrCreateReferencesFile (projectFile:ProjectFile) =

diff --git a/src/Paket.Core/Installation/WrapperToolGeneration.fs b/src/Paket.Core/Installation/WrapperToolGeneration.fs
@@ -67,6 +67,21 @@ module WrapperToolGeneration =
         member self.Save (rootPath:DirectoryInfo) =
             saveScript self.Render rootPath self.PartialPath
 
+    type ScriptAddToPATHPowershell = {
+        PartialPath : string
+    } with
+        member self.Render (_directory:DirectoryInfo) =
+            let cmdContent =
+                [ ""
+                  "$env:PATH = $PSScriptRoot + ';' + $env:PATH"
+                  "" ]
+
+            cmdContent |> String.concat "\r\n"
+
+        /// Save the script in '<directory>/paket-files/bin/<script>'
+        member self.Save (rootPath:DirectoryInfo) =
+            saveScript self.Render rootPath self.PartialPath
+
     type ScriptContentWindows = {
         PartialPath : string
         RelativeToolPath : string
@@ -171,6 +186,7 @@ module WrapperToolGeneration =
         | Shell of ScriptContentShell
         | WindowsAddToPATH of ScriptAddToPATHWindows
         | ShellAddToPATH of ScriptAddToPATHShell
+        | PowershellAddToPATH of ScriptAddToPATHPowershell
 
     type RepoToolInNupkg =
         { FullPath: string
@@ -329,6 +345,9 @@ module WrapperToolGeneration =
                 [ { ScriptAddToPATHWindows.PartialPath = scriptPath </> "add_to_PATH.cmd" }
                   |> ScriptContent.WindowsAddToPATH
 
+                  { ScriptAddToPATHPowershell.PartialPath = scriptPath </> "add_to_PATH.ps1" }
+                  |> ScriptContent.PowershellAddToPATH
+
                   { ScriptAddToPATHShell.PartialPath = scriptPath </> "add_to_PATH.sh" }
                   |> ScriptContent.ShellAddToPATH ] )