From 9d7f99bd00f35cdd987a8ee11e1b0c398584b703 Mon Sep 17 00:00:00 2001 From: Yuto Tanaka Date: Thu, 30 Nov 2023 18:12:46 +0900 Subject: [PATCH] Fix many typos --- data/config.yaml | 2 +- docs/guide.md | 4 ++-- lib-opt/GHCup/OptParse/Compile.hs | 2 +- lib/GHCup/Errors.hs | 4 ++-- lib/GHCup/GHC.hs | 4 ++-- lib/GHCup/Platform.hs | 2 +- lib/GHCup/Prelude/File/Posix.hs | 2 +- lib/GHCup/Prelude/Process/Posix.hs | 2 +- lib/GHCup/Utils.hs | 2 +- lib/GHCup/Version.hs | 2 +- scoop-better-shimexe/shim.c | 2 +- scripts/bootstrap/bootstrap-haskell | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/config.yaml b/data/config.yaml index 024c377..e5b0839 100644 --- a/data/config.yaml +++ b/data/config.yaml @@ -92,7 +92,7 @@ url-source: # sha256: b48f3d3a508d0c140d1c801e04afc65e80c0d25e7e939a8a41edb387b26b81b3 # This is a way to override platform detection, e.g. when you're running -# a Ubuntu derivate based on 18.04, you could do: +# a Ubuntu derivative based on 18.04, you could do: # # platform-override: # arch: A_64 diff --git a/docs/guide.md b/docs/guide.md index e230ac0..4a34d4b 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -79,7 +79,7 @@ Partial configuration is fine. Command line options always override the config f ## Overriding distro detection -If you're running e.g. an Ubuntu derivate based on 18.04 and ghcup is picking bindists that +If you're running e.g. an Ubuntu derivative based on 18.04 and ghcup is picking bindists that don't work well, you could do this in `config.yaml`: ```yml @@ -611,7 +611,7 @@ Examples: ## Continuous integration On Windows, GHCup can be installed automatically on a CI runner -non-interactively, as below. The paramaters to the PowerShell script are +non-interactively, as below. The parameters to the PowerShell script are specified positionally, after `-ArgumentList`: ```ps diff --git a/lib-opt/GHCup/OptParse/Compile.hs b/lib-opt/GHCup/OptParse/Compile.hs index 1d1d908..2c148c8 100644 --- a/lib-opt/GHCup/OptParse/Compile.hs +++ b/lib-opt/GHCup/OptParse/Compile.hs @@ -158,7 +158,7 @@ Examples: ghcup compile hls --version 1.7.0.0 --ghc 8.10.7 --cabal-update # compile from master for ghc 9.2.3 using 'git describe' to name the binary and ignore the pinned index state ghcup compile hls -g master --git-describe-version --ghc 9.2.3 -- --index-state=@(date '+%s') - # compile a specific commit for ghc 9.2.3 and set a specifc version for the binary name + # compile a specific commit for ghc 9.2.3 and set a specific version for the binary name ghcup compile hls -g a32db0b -o 1.7.0.0-p1 --ghc 9.2.3|] diff --git a/lib/GHCup/Errors.hs b/lib/GHCup/Errors.hs index 7cac935..f506b37 100644 --- a/lib/GHCup/Errors.hs +++ b/lib/GHCup/Errors.hs @@ -524,7 +524,7 @@ data HTTPNotModified = HTTPNotModified Text instance Pretty HTTPNotModified where pPrint (HTTPNotModified etag) = - text "Remote resource not modifed, etag was:" <+> pPrint etag + text "Remote resource not modified, etag was:" <+> pPrint etag instance HFErrorProject HTTPNotModified where eBase _ = 240 @@ -819,7 +819,7 @@ instance Exception ParseError instance HFErrorProject ParseError where eBase _ = 500 - eDesc _ = "A parse error occured." + eDesc _ = "A parse error occurred." data UnexpectedListLength = UnexpectedListLength String diff --git a/lib/GHCup/GHC.hs b/lib/GHCup/GHC.hs index 1f0f26c..a9e562f 100644 --- a/lib/GHCup/GHC.hs +++ b/lib/GHCup/GHC.hs @@ -1102,8 +1102,8 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build let possible_files = if isWindows then ((workdir "hadrian") ) <$> ["build.bat"] else ((workdir "hadrian") ) <$> ["build", "build.sh"] - exsists <- forM possible_files (\f -> liftIO (doesFileExist f) <&> (,f)) - case filter fst exsists of + exists <- forM possible_files (\f -> liftIO (doesFileExist f) <&> (,f)) + case filter fst exists of [] -> throwE HadrianNotFound ((_, x):_) -> pure x diff --git a/lib/GHCup/Platform.hs b/lib/GHCup/Platform.hs index b580335..b3ae321 100644 --- a/lib/GHCup/Platform.hs +++ b/lib/GHCup/Platform.hs @@ -8,7 +8,7 @@ {-| -Module : GHCup.Plaform +Module : GHCup.Platform Description : Retrieving platform information Copyright : (c) Julian Ospald, 2020 License : LGPL-3.0 diff --git a/lib/GHCup/Prelude/File/Posix.hs b/lib/GHCup/Prelude/File/Posix.hs index 3bab560..dbd3655 100644 --- a/lib/GHCup/Prelude/File/Posix.hs +++ b/lib/GHCup/Prelude/File/Posix.hs @@ -240,7 +240,7 @@ recreateSymlink symsource newsym fail' = do createSymbolicLink sympoint newsym --- copys files, recreates symlinks, fails on all other types +-- copies files, recreates symlinks, fails on all other types install :: FilePath -> FilePath -> Bool -> IO () install from to fail' = do fs <- PF.getSymbolicLinkStatus from diff --git a/lib/GHCup/Prelude/Process/Posix.hs b/lib/GHCup/Prelude/Process/Posix.hs index bdc263b..6089be6 100644 --- a/lib/GHCup/Prelude/Process/Posix.hs +++ b/lib/GHCup/Prelude/Process/Posix.hs @@ -148,7 +148,7 @@ execLogged exe args chdir lfile env = do void $ SPIB.fdWrite fileFd (bs' <> "\n") void $ SPIB.fdWrite stdOutput (bs' <> "\n") - -- Reads fdIn and logs the output in a continous scrolling area + -- Reads fdIn and logs the output in a continuous scrolling area -- of 'size' terminal lines. Also writes to a log file. printToRegion :: Fd -> Fd -> Int -> MVar Bool -> Bool -> IO () printToRegion fileFd fdIn size pState no_color = do diff --git a/lib/GHCup/Utils.hs b/lib/GHCup/Utils.hs index 6807008..015be12 100644 --- a/lib/GHCup/Utils.hs +++ b/lib/GHCup/Utils.hs @@ -280,7 +280,7 @@ rmPlainHLS = do ----------------------------------- --- | Whether the given GHC versin is installed. +-- | Whether the given GHC version is installed. ghcInstalled :: (MonadIO m, MonadReader env m, HasDirs env, MonadThrow m) => GHCTargetVersion -> m Bool ghcInstalled ver = do ghcdir <- ghcupGHCDir ver diff --git a/lib/GHCup/Version.hs b/lib/GHCup/Version.hs index 9e01725..3ac33e2 100644 --- a/lib/GHCup/Version.hs +++ b/lib/GHCup/Version.hs @@ -31,7 +31,7 @@ import Data.Void (Void) -- | This reflects the API version of the YAML. -- --- Note that when updating this, CI requires that the file exsists AND the same file exists at +-- Note that when updating this, CI requires that the file exists AND the same file exists at -- 'https://www.haskell.org/ghcup/exp/ghcup-.yaml' with some newlines added. ghcupURL :: URI ghcupURL = [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.8.yaml|] diff --git a/scoop-better-shimexe/shim.c b/scoop-better-shimexe/shim.c index 2415738..1d39787 100644 --- a/scoop-better-shimexe/shim.c +++ b/scoop-better-shimexe/shim.c @@ -205,7 +205,7 @@ int main() // CreateProcess, and therefore we fallback to ShellExecuteEx, // which CAN create elevated processes, at the cost of opening a new separate // window. - // Theorically, this could be fixed (or rather, worked around) using pipes + // Theoretically, this could be fixed (or rather, worked around) using pipes // and IPC, but... this is a question for another day. SHELLEXECUTEINFOW sei = {0}; diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index db5841c..8f7d88e 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -680,7 +680,7 @@ ask_hls() { *) echo "Possible choices are:" echo - echo "Y - Yes, install the haskell-langauge-server" + echo "Y - Yes, install the haskell-language-server" echo "N - No, don't install anything more (default)" echo echo "Please make your choice and press ENTER."