From 3f0befe30dd48c9d1ce71007475b373002ebda41 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 22 Nov 2021 22:52:13 +0100 Subject: [PATCH] Fix `ghcup whereis ghc` for non-standard versions, fixes #289 --- lib/GHCup/Utils.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/GHCup/Utils.hs b/lib/GHCup/Utils.hs index 3ee7478..a95d685 100644 --- a/lib/GHCup/Utils.hs +++ b/lib/GHCup/Utils.hs @@ -1141,11 +1141,11 @@ ensureDirectories (Dirs baseDir binDir cacheDir logsDir confDir trashDir) = do -- | For ghc without arch triple, this is: -- --- - ghc- (e.g. ghc-8.10.4) +-- - ghc -- -- For ghc with arch triple: -- --- - -ghc- (e.g. arm-linux-gnueabihf-ghc-8.10.4) +-- - -ghc (e.g. arm-linux-gnueabihf-ghc) ghcBinaryName :: GHCTargetVersion -> String -ghcBinaryName (GHCTargetVersion (Just t) v') = T.unpack (t <> "-ghc-" <> prettyVer v' <> T.pack exeExt) -ghcBinaryName (GHCTargetVersion Nothing v') = T.unpack ("ghc-" <> prettyVer v' <> T.pack exeExt) +ghcBinaryName (GHCTargetVersion (Just t) _) = T.unpack (t <> "-ghc" <> T.pack exeExt) +ghcBinaryName (GHCTargetVersion Nothing _) = T.unpack ("ghc" <> T.pack exeExt)