diff options
| -rw-r--r-- | Command/P2P.hs | 4 | ||||
| -rw-r--r-- | Utility/Tor.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Command/P2P.hs b/Command/P2P.hs index f2443e787..a4129445b 100644 --- a/Command/P2P.hs +++ b/Command/P2P.hs @@ -166,7 +166,7 @@ performPairing remotename addrs = do case Wormhole.toCode l of Just code | code /= ourcode -> do - putStrLn "Pairing in process..." + putStrLn "Exchanging pairing data..." return code | otherwise -> do putStrLn "Oops -- You entered this repository's pairing code. We need the pairing code of the *other* repository." @@ -258,7 +258,7 @@ finishPairing :: Int -> RemoteName -> HalfAuthToken -> PairData -> Annex Pairing finishPairing retries remotename (HalfAuthToken ourhalf) (PairData (HalfAuthToken theirhalf) theiraddrs) = do case (toAuthToken (ourhalf <> theirhalf), toAuthToken (theirhalf <> ourhalf)) of (Just ourauthtoken, Just theirauthtoken) -> do - liftIO $ putStrLn $ "Successfully exchanged pairing data. Connecting to " ++ remotename ++ " ..." + liftIO $ putStrLn $ "Successfully exchanged pairing data. Connecting to " ++ remotename ++ "..." storeP2PAuthToken ourauthtoken go retries theiraddrs theirauthtoken _ -> return ReceiveFailed diff --git a/Utility/Tor.hs b/Utility/Tor.hs index 5457a5a24..71628084c 100644 --- a/Utility/Tor.hs +++ b/Utility/Tor.hs @@ -70,7 +70,7 @@ addHiddenService uid ident = do -- service and generate the hostname file for it. reloaded <- anyM (uncurry boolSystem) [ ("systemctl", [Param "reload", Param "tor"]) - , ("sefvice", [Param "tor", Param "reload"]) + , ("service", [Param "tor", Param "reload"]) ] unless reloaded $ giveup "failed to reload tor, perhaps the tor service is not running" |