Blah

lib/GHCup.hs

@@ -191,6 +191,7 @@ getLinuxDistro = do
         | hasWord name ["exherbo"] -> Exherbo
         | hasWord name ["gentoo"]  -> Gentoo
         | otherwise                -> UnknownLinux
+  recreateSymlink undefined undefined Overwrite
   pure (distro, parsedVer)
  where
   hasWord t matches = foldr
@@ -208,8 +209,8 @@ getLinuxDistro = do
   os_release = [abs|/etc/os-release|]
   lsb_release :: Path Abs
   lsb_release = [abs|/etc/lsb-release|]
-  lsb_release_cmd :: Path Fn
-  lsb_release_cmd = [fn|lsb-release|]
+  lsb_release_cmd :: Path Rel
+  lsb_release_cmd = [rel|lsb-release|]
   redhat_release :: Path Abs
   redhat_release = [abs|/etc/redhat-release|]
   debian_version :: Path Abs
@@ -269,12 +270,12 @@ getLinuxDistro = do
 --   2. otherwise create a random file
 --
 -- The file must not exist.
-download :: Bool            -- ^ https?
-         -> String          -- ^ host (e.g. "www.example.com")
-         -> String          -- ^ path (e.g. "/my/file")
-         -> Maybe Integer   -- ^ optional port (e.g. 3000)
-         -> Path Abs        -- ^ destination directory to download into
-         -> Maybe (Path Fn) -- ^ optionally provided filename
+download :: Bool             -- ^ https?
+         -> String           -- ^ host (e.g. "www.example.com")
+         -> String           -- ^ path (e.g. "/my/file")
+         -> Maybe Integer    -- ^ optional port (e.g. 3000)
+         -> Path Abs         -- ^ destination directory to download into
+         -> Maybe (Path Rel) -- ^ optionally provided filename
          -> IO (Path Abs)
 download https host path port dest mfn = do
   fromJust <$> downloadInternal https host path port (Right (dest, mfn))
@@ -283,7 +284,7 @@ download https host path port dest mfn = do
 -- throw an exception if the url type or host protocol is not supported.
 --
 -- Only Absolute HTTP/HTTPS is supported.
-download' :: URL -> Path Abs -> Maybe (Path Fn) -> IO (Path Abs)
+download' :: URL -> Path Abs -> Maybe (Path Rel) -> IO (Path Abs)
 download' url dest mfn = case url of
   URL { url_type = Absolute (Host { protocol = HTTP https, host = host, port = port }), url_path = path, url_params = [] }
     -> download https host path port dest mfn
@@ -306,7 +307,7 @@ downloadInternal :: Bool
                  -> String
                  -> String
                  -> Maybe Integer
-                 -> Either Fd (Path Abs, Maybe (Path Fn))
+                 -> Either Fd (Path Abs, Maybe (Path Rel))
                  -> IO (Maybe (Path Abs))
 downloadInternal https host path port dest = do
   c <- case https of
@@ -345,7 +346,7 @@ downloadInternal https host path port dest = do
 
  where
   -- Manage to find a file we can write the body into.
-  getFile :: Path Abs -> Maybe (Path Fn) -> IO (Fd, Path Abs)
+  getFile :: Path Abs -> Maybe (Path Rel) -> IO (Fd, Path Abs)
   getFile dest mfn = do
     -- destination dir must exist
     hideError AlreadyExists $ createDirRecursive newDirPerms dest
@@ -358,7 +359,7 @@ downloadInternal https host path port dest = do
         -- ...otherwise try to infer the filename from the URL path
         case (snd . T.breakOnEnd (fS "/") . T.pack) <$> decString False path of
           Just x -> do
-            fn' <- parseFn (C.pack $ T.unpack x)
+            fn' <- parseRel (C.pack $ T.unpack x)
             let fp = dest </> fn'
             fmap (, fp) $ createRegularFileFd newFilePerms fp
           Nothing -> do

lib/GHCup/File.hs

@@ -49,24 +49,11 @@ data CapturedProcess = CapturedProcess {
 makeLenses ''CapturedProcess
 
 
--- |Checks whether a file is executable. Follows symlinks.
---
--- Only eACCES, eROFS, eTXTBSY, ePERM are catched (and return False).
---
--- Throws:
---
---     - `NoSuchThing` if the file does not exist
---
--- Note: calls `access`
-isExecutable :: Path b -> IO Bool
-isExecutable p = fileAccess (toFilePath p) False False True
-
-
 readFd :: Fd -> IO L.ByteString
 readFd fd = do
   handle' <- fdToHandle fd
   let stream =
-        (S.unfold (SU.finally hClose FH.readChunks) handle')
+        (S.unfold (SU.finallyIO hClose FH.readChunks) handle')
           >>= arrayToByteString
   toLazyByteString <$> S.fold FL.mconcat (fmap byteString stream)
 
@@ -89,7 +76,7 @@ readFileLines p = do
 --
 -- This shouldn't throw IO exceptions, unless getting the environment variable
 -- PATH does.
-findExecutable :: RelC r => Path r -> IO (Maybe (Path Abs))
+findExecutable :: Path Rel -> IO (Maybe (Path Abs))
 findExecutable ex = do
   sPaths <- fmap catMaybes . (fmap . fmap) parseAbs $ getSearchPath
   -- We don't want exceptions to mess up our result. If we can't
@@ -102,10 +89,10 @@ findExecutable ex = do
 
 -- | Execute the given command and collect the stdout, stderr and the exit code.
 -- The command is run in a subprocess.
-executeOut :: Path Fn      -- ^ command as filename, e.g. 'ls'
-           -> [ByteString] -- ^ arguments to the command
+executeOut :: Path Rel      -- ^ command as filename, e.g. 'ls'
+           -> [ByteString]  -- ^ arguments to the command
            -> IO (Maybe CapturedProcess)
-executeOut path args = withFnPath path
+executeOut path args = withRelPath path
   $ \fp -> captureOutStreams $ SPPB.executeFile fp True args Nothing
 
 

lib/GHCup/Types.hs

@@ -6,16 +6,7 @@ import           Data.Map.Strict                ( Map )
 import           Network.URL
 import qualified GHC.Generics                  as GHC
 import           Data.Versions
-import           HPath
-import           System.Posix.Types
 
-data DownloadDestination = DPath {
-    dDestDir :: Path Abs
-  , dFileName :: Maybe (Path Fn)
-  } |
-  Fd {
-    dFd :: Fd
-  }
 
 data Tool = GHC
           | Cabal