From 63dfdc2da6b7789a8eeccd508154f44ed5f263b6 Mon Sep 17 00:00:00 2001 From: taylorfausak Date: Mon, 22 Aug 2022 19:35:38 +0000 Subject: [PATCH 1/3] Remove hard-coded reference to "cabal" Fixes #407. --- lib/GHCup/Errors.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/GHCup/Errors.hs b/lib/GHCup/Errors.hs index a629add..2b679c8 100644 --- a/lib/GHCup/Errors.hs +++ b/lib/GHCup/Errors.hs @@ -138,7 +138,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version instance Pretty AlreadyInstalled where pPrint (AlreadyInstalled tool ver') = (pPrint tool <> text "-" <> pPrint ver') <+> text "is already installed;" - <+> text "if you really want to reinstall it, you may want to run 'ghcup install cabal --force" <+> (pPrint ver' <> text "'") + <+> text "if you really want to reinstall it, you may want to run 'ghcup install " <+> pPrint tool <+> " --force" <+> (pPrint ver' <> text "'") -- | The Directory is supposed to be empty, but wasn't. From 04369673efa91f7d9243d38323d3ebdbfb26122f Mon Sep 17 00:00:00 2001 From: taylorfausak Date: Tue, 23 Aug 2022 11:19:33 +0000 Subject: [PATCH 2/3] Fix spacing --- lib/GHCup/Errors.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/GHCup/Errors.hs b/lib/GHCup/Errors.hs index 2b679c8..abfd6c0 100644 --- a/lib/GHCup/Errors.hs +++ b/lib/GHCup/Errors.hs @@ -138,7 +138,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version instance Pretty AlreadyInstalled where pPrint (AlreadyInstalled tool ver') = (pPrint tool <> text "-" <> pPrint ver') <+> text "is already installed;" - <+> text "if you really want to reinstall it, you may want to run 'ghcup install " <+> pPrint tool <+> " --force" <+> (pPrint ver' <> text "'") + <+> text "if you really want to reinstall it, you may want to run 'ghcup install" <+> pPrint tool <+> "--force" <+> (pPrint ver' <> text "'") -- | The Directory is supposed to be empty, but wasn't. From ab97c80b801659039931d28704600a6d223447f9 Mon Sep 17 00:00:00 2001 From: taylorfausak Date: Tue, 23 Aug 2022 11:59:08 +0000 Subject: [PATCH 3/3] Fix build error --- lib/GHCup/Errors.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/GHCup/Errors.hs b/lib/GHCup/Errors.hs index abfd6c0..0ce4a01 100644 --- a/lib/GHCup/Errors.hs +++ b/lib/GHCup/Errors.hs @@ -138,7 +138,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version instance Pretty AlreadyInstalled where pPrint (AlreadyInstalled tool ver') = (pPrint tool <> text "-" <> pPrint ver') <+> text "is already installed;" - <+> text "if you really want to reinstall it, you may want to run 'ghcup install" <+> pPrint tool <+> "--force" <+> (pPrint ver' <> text "'") + <+> text "if you really want to reinstall it, you may want to run 'ghcup install" <+> pPrint tool <+> text "--force" <+> (pPrint ver' <> text "'") -- | The Directory is supposed to be empty, but wasn't.