From e1d8ba869af93ecd3869da41de35af7505b92c65 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Sat, 22 Jul 2023 17:16:58 +0800 Subject: [PATCH 1/3] Add missing stack for changelog parser --- app/ghcup/GHCup/OptParse/ChangeLog.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ghcup/GHCup/OptParse/ChangeLog.hs b/app/ghcup/GHCup/OptParse/ChangeLog.hs index f209a74..b7e7292 100644 --- a/app/ghcup/GHCup/OptParse/ChangeLog.hs +++ b/app/ghcup/GHCup/OptParse/ChangeLog.hs @@ -75,7 +75,7 @@ changelogP = e -> Left e ) ) - (short 't' <> long "tool" <> metavar "" <> help + (short 't' <> long "tool" <> metavar "" <> help "Open changelog for given tool (default: ghc)" <> completer toolCompleter ) From 2df2e3da401ec196742358381863431382295b94 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Sun, 23 Jul 2023 15:47:47 +0800 Subject: [PATCH 2/3] extend unset ghc optparse example --- app/ghcup/GHCup/OptParse/UnSet.hs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/ghcup/GHCup/OptParse/UnSet.hs b/app/ghcup/GHCup/OptParse/UnSet.hs index a3b33b7..68a287e 100644 --- a/app/ghcup/GHCup/OptParse/UnSet.hs +++ b/app/ghcup/GHCup/OptParse/UnSet.hs @@ -113,7 +113,14 @@ unsetParser = unsetGHCFooter :: String unsetGHCFooter = [s|Discussion: Unsets the the current GHC version. That means there won't - be a ~/.ghcup/bin/ghc anymore.|] + be a ~/.ghcup/bin/ghc anymore. + +Examples: + # unset ghc + ghcup unset ghc + + # unset ghc for the target version + ghcup unset ghc armv7-unknown-linux-gnueabihf|] unsetCabalFooter :: String unsetCabalFooter = [s|Discussion: From 9189f9a65ac0063a8e29d1ebae220ad6b80ff42d Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Tue, 25 Jul 2023 23:01:44 +0800 Subject: [PATCH 3/3] Add absolute description --- app/ghcup/GHCup/OptParse/Compile.hs | 4 ++-- app/ghcup/GHCup/OptParse/Install.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/ghcup/GHCup/OptParse/Compile.hs b/app/ghcup/GHCup/OptParse/Compile.hs index f50fb9d..247e51f 100644 --- a/app/ghcup/GHCup/OptParse/Compile.hs +++ b/app/ghcup/GHCup/OptParse/Compile.hs @@ -277,7 +277,7 @@ ghcCompileOpts = ( short 'i' <> long "isolate" <> metavar "DIR" - <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made" + <> help "install in an isolated absolute directory instead of the default one, no symlinks to this installation will be made" <> completer (bashCompleter "directory") ) ) @@ -360,7 +360,7 @@ hlsCompileOpts = ( short 'i' <> long "isolate" <> metavar "DIR" - <> help "install in an isolated directory instead of the default one, no symlinks to this installation will be made" + <> help "install in an isolated absolute directory instead of the default one, no symlinks to this installation will be made" <> completer (bashCompleter "directory") ) ) diff --git a/app/ghcup/GHCup/OptParse/Install.hs b/app/ghcup/GHCup/OptParse/Install.hs index e13f740..1884e65 100644 --- a/app/ghcup/GHCup/OptParse/Install.hs +++ b/app/ghcup/GHCup/OptParse/Install.hs @@ -196,7 +196,7 @@ installOpts tool = ( short 'i' <> long "isolate" <> metavar "DIR" - <> help "install in an isolated dir instead of the default one" + <> help "install in an isolated absolute directory instead of the default one" <> completer (bashCompleter "directory") ) )