typo
authorJoey Hess <joeyh@joeyh.name>
Sun, 18 Dec 2016 21:13:06 +0000 (17:13 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 18 Dec 2016 21:16:53 +0000 (17:16 -0400)
Command/P2P.hs
Utility/Tor.hs

index f2443e787ee0d0364a9e2965a4395e396974ecca..a4129445bfe0696ce9fb78d05148135bafe049cd 100644 (file)
@@ -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
index 5457a5a24b5b914526093ea2d4a02541cfcb3478..71628084ce867aff244847eac308b3bef636f2e8 100644 (file)
@@ -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"