Merge pull request #131 from commercialhaskell/fix192-3

Fix #129 loadRawPackage works with submodules on Windows

ChangeLog.md

@@ -1,5 +1,10 @@
 # Changelog for pantry
 
+## v0.9.3.3
+
+* Bug fix: On Windows, `loadPackageRaw` supports repositories with submodules,
+  as intended.
+
 ## v0.9.3.2
 
 * Support `ansi-terminal-1.0.2`.

package.yaml

@@ -1,5 +1,5 @@
 name: pantry
-version: 0.9.3.2
+version: 0.9.3.3
 synopsis: Content addressable Haskell package management
 description: Please see the README on GitHub at <https://github.com/commercialhaskell/pantry#readme>
 category: Development

src/Pantry/Repo.hs

@@ -243,13 +243,19 @@ archiveSubmodules tarball = do
           then " --force-local "
           else mempty
   case tarType of
-    Gnu -> runGitCommand
-      [ "submodule"
-      , "foreach"
-      , "--recursive"
-      , "git -c core.autocrlf=false archive --prefix=$displaypath/ -o bar.tar HEAD; "
-        <> "tar" <> forceLocal <> " -Af " <> tarball <> " bar.tar"
-      ]
+    Gnu -> do
+      -- Single quotation marks are required around tarball because otherwise,
+      -- in the foreach environment, the \ character in absolute paths on
+      -- Windows will be interpreted as escaping the following character.
+      let foreachCommand =
+            "git -c core.autocrlf=false archive --prefix=$displaypath/ -o bar.tar HEAD; "
+            <> "tar" <> forceLocal <> " -Af '" <> tarball <> "' bar.tar"
+      runGitCommand
+        [ "submodule"
+        , "foreach"
+        , "--recursive"
+        , foreachCommand
+        ]
     Bsd -> runGitCommand
       [ "submodule"
       , "foreach"