Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix agent code review

Browse Source
This commit is contained in:
Keagan McClelland
2021-07-13 15:09:40 -06:00
parent 5caf6b3d90
commit 70397eaf10
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
agent/src/Lib/Synchronizers.hs
View File

@@ -595,7 +595,6 @@ syncUpgradeTor = SyncOp "Install Latest Tor" check migrate False
shell "apt-get clean" shell "apt-get clean"
shell "apt-get update" shell "apt-get update"
mTorVersion <- (shell "dpkg -s tor" $| shell "grep '^Version'" $| shell "cut -d ' ' -f2" $| conduit await) mTorVersion <- (shell "dpkg -s tor" $| shell "grep '^Version'" $| shell "cut -d ' ' -f2" $| conduit await)
echo ("CURRENT TOR VERSION:" :: Text) (show mTorVersion :: Text)
let torVersion = case mTorVersion of let torVersion = case mTorVersion of
Nothing -> panic "invalid output from dpkg, can't read tor version" Nothing -> panic "invalid output from dpkg, can't read tor version"
Just x -> x Just x -> x
@@ -604,9 +603,9 @@ syncUpgradeTor = SyncOp "Install Latest Tor" check migrate False
shell "apt-get update" shell "apt-get update"
availVersions <- availVersions <-
(shell "apt-cache madison tor" $| shell "cut -d '|' -f2" $| shell "xargs" $| conduit consume) (shell "apt-cache madison tor" $| shell "cut -d '|' -f2" $| shell "xargs" $| conduit consume)
let latest = case lastMay $ sortBy compareTorVersions availVersions of latest <- case lastMay $ sortBy compareTorVersions availVersions of
Nothing -> panic "No available versions of tor" Nothing -> throwIO $ ErrorCall "No available versions of tor"
Just x -> x Just x -> pure x
shell $ "apt-get install -y tor=" <> if "0.3.5.15-1" `elem` availVersions shell $ "apt-get install -y tor=" <> if "0.3.5.15-1" `elem` availVersions
then "0.3.5.15-1" then "0.3.5.15-1"
else (C8.unpack latest) else (C8.unpack latest)