From fcdc4797a9ab2b792a9bb20f2ca9802b8f6d5a1e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Feb 2011 16:10:16 -0400
Subject: use ShellParam type

So, I have a type checked safe handling of filenames starting with dashes,
throughout the code.
---
 Command/Map.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Command/Map.hs')

diff --git a/Command/Map.hs b/Command/Map.hs
index 0a3bb9fff..00b5fc21b 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -44,7 +44,7 @@ start = do
 	liftIO $ writeFile file (drawMap rs umap trusted)
 	showLongNote $ "running: dot -Tx11 " ++ file
 	showProgress
-	r <- liftIO $ boolSystem "dot" ["-Tx11", file]
+	r <- liftIO $ boolSystem "dot" [Param "-Tx11", File file]
 	return $ Just $ return $ Just $ return r
 	where
 		file = "map.dot"
@@ -198,7 +198,7 @@ tryScan r
 				Left _ -> return Nothing
 				Right r' -> return $ Just r'
 		pipedconfig cmd params = safely $
-			pOpen ReadFromPipe cmd params $
+			pOpen ReadFromPipe cmd (toShell params) $
 				Git.hConfigRead r
 
 		configlist =
@@ -208,8 +208,9 @@ tryScan r
 			let sshcmd =
 				"cd " ++ shellEscape(Git.workTree r) ++ " && " ++
 				"git config --list"
-			liftIO $ pipedconfig "ssh" $
-				words sshoptions ++ [Git.urlHostFull r, sshcmd]
+			liftIO $ pipedconfig "ssh" $ map Param $ 
+					words sshoptions ++
+					[Git.urlHostFull r, sshcmd]
 
 		-- First, try sshing and running git config manually,
 		-- only fall back to git-annex-shell configlist if that
-- 
cgit v1.2.3