Merge remote-tracking branch 'origin/pr/864'

haskell · Sep 2, 2023 · 9c34780 · 9c34780
2 parents 7e7c11f + 9189f9a
commit 9c34780
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git 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 "<ghc|cabal|hls|ghcup>" <> help
+            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|ghcup|stack>" <> help
               "Open changelog for given tool (default: ghc)"
               <> completer toolCompleter
             )

diff --git a/app/ghcup/GHCup/OptParse/Compile.hs b/app/ghcup/GHCup/OptParse/Compile.hs
@@ -284,7 +284,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")
             )
            )
@@ -367,7 +367,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
@@ -197,7 +197,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")
            )
           )

diff --git a/app/ghcup/GHCup/OptParse/UnSet.hs b/app/ghcup/GHCup/OptParse/UnSet.hs
@@ -114,7 +114,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: