From a077600c7eab1df85d88f303d19a3a9d0b9c25c8 Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Tue, 13 Jul 2021 14:17:41 -0600 Subject: [PATCH] fix build issues --- agent/src/Lib/Synchronizers.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agent/src/Lib/Synchronizers.hs b/agent/src/Lib/Synchronizers.hs index 12fc41e0e..a010666cc 100644 --- a/agent/src/Lib/Synchronizers.hs +++ b/agent/src/Lib/Synchronizers.hs @@ -52,6 +52,7 @@ import Control.Effect.Error hiding ( run ) import Control.Effect.Labelled ( runLabelled ) import Daemon.ZeroConf ( getStart9AgentHostname ) import Data.ByteString.Char8 ( split ) +import qualified Data.ByteString.Char8 as C8 import Data.Conduit.List ( consume ) import qualified Data.Text as T import Foundation @@ -606,7 +607,9 @@ syncUpgradeTor = SyncOp "Install Latest Tor" check migrate False let latest = case lastMay $ sortBy compareTorVersions availVersions of Nothing -> panic "No available versions of tor" Just x -> x - shell $ "apt-get install -y tor=" <> if "0.3.5.15-1" `elem` availVersions then "0.3.5.15-1" else latest + shell $ "apt-get install -y tor=" <> if "0.3.5.15-1" `elem` availVersions + then "0.3.5.15-1" + else (C8.unpack latest) compareTorVersions :: ByteString -> ByteString -> Ordering compareTorVersions a b = let a' = (traverse (readMaybe @Int . decodeUtf8) . (split '.' <=< split '-') $ a)