Merge pull request #770 from Stift/FixGetHomeForLocalNuget

Fixed home path detection
fsprojects · Apr 13, 2015 · a0fdf6f · a0fdf6f
2 parents 72fdf39 + d0b8ccd
commit a0fdf6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Paket.Core/Utils.fs b/src/Paket.Core/Utils.fs
@@ -36,12 +36,12 @@ let GetHomeDirectory() =
     else
         Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%")
 
-let normalizeLocalPath(path:string) =
+let normalizeLocalPath(path:string)=
     if path.StartsWith("~/") then
-        Path.Combine(GetHomeDirectory(),path.Substring(1))
-    else
+        Path.Combine(GetHomeDirectory(), path.Substring(2))
+    else 
         path
-
+        
 /// Creates a directory if it does not exist.
 let createDir path = 
     try

diff --git a/tests/Paket.Tests/UtilsSpecs.fs b/tests/Paket.Tests/UtilsSpecs.fs
@@ -1,5 +1,6 @@
 module Paket.UtilsSpecs
 
+open System.IO
 open Paket
 open NUnit.Framework
 open FsUnit
@@ -8,4 +9,11 @@ open FsUnit
 let ``createRelativePath should handle spaces``() =
     "C:/some file" 
     |> createRelativePath "C:/a/b" 
-    |> shouldEqual "..\\some file"
+    |> shouldEqual "..\\some file"
+
+
+[<Test>]
+let ``normalize path with home directory``() =
+    "~/data" 
+    |> Utils.normalizeLocalPath
+    |> shouldEqual (GetHomeDirectory() + Path.DirectorySeparatorChar.ToString()  +  "data")