aboutsummaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-11 19:14:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-11 19:14:30 -0400
commitcbc98eee9d583f56d52a70fbff7abe171a1ecebe (patch)
tree90dacacdd69cbeb1770c48471d40fc3892c51217 /Command
parent618af8b6772d25ab27336d240ecddae7ae207561 (diff)
use setCurrentDirectory
On POSIX, this just calls changeWorkingDirectory.
Diffstat (limited to 'Command')
-rw-r--r--Command/Assistant.hs3
-rw-r--r--Command/WebApp.hs3
2 files changed, 2 insertions, 4 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 32c9c7a15..c40c9e5e9 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -15,7 +15,6 @@ import Init
import Config.Files
import System.Environment
-import System.Posix.Directory
def :: [Command]
def = [noRepo checkAutoStart $ dontCheck repoExists $
@@ -64,5 +63,5 @@ autoStart = do
)
where
go program dir = do
- changeWorkingDirectory dir
+ setCurrentDirectory dir
boolSystem program [Param "assistant"]
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index 705ff6980..d15319078 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -28,7 +28,6 @@ import qualified Annex
import Config.Files
import qualified Option
-import System.Posix.Directory
import Control.Concurrent
import Control.Concurrent.STM
import System.Process (env, std_out, std_err)
@@ -97,7 +96,7 @@ startNoRepo = do
case dirs of
[] -> firstRun listenhost
(d:_) -> do
- changeWorkingDirectory d
+ setCurrentDirectory d
state <- Annex.new =<< Git.CurrentRepo.get
void $ Annex.eval state $ doCommand $
start' False listenhost