Improve SC2259/60/61 messages

This commit is contained in:
Vidar Holen 2020-05-03 21:46:16 -07:00
parent 2030b83607
commit d6adbfde78
1 changed files with 2 additions and 2 deletions

View File

@ -3336,7 +3336,7 @@ checkPipeToNowhere params t =
guard $ input /= NoPipe && not hasConsumers guard $ input /= NoPipe && not hasConsumers
(override:_) <- Map.lookup 0 fdMap (override:_) <- Map.lookup 0 fdMap
return $ err (getOpId override) 2259 $ return $ err (getOpId override) 2259 $
"This redirection overrides piped input. To use both, merge or pass filename." "This redirection overrides piped input. To use both, merge or pass filenames."
-- Only produce output warnings for regular pipes, since these are -- Only produce output warnings for regular pipes, since these are
-- way more common, and `foo > out 2> err |& foo` can still write -- way more common, and `foo > out 2> err |& foo` can still write
@ -3354,7 +3354,7 @@ checkPipeToNowhere params t =
warnAboutDupes (n, list@(_:_:_)) = warnAboutDupes (n, list@(_:_:_)) =
forM_ list $ \c -> err (getOpId c) 2261 $ forM_ list $ \c -> err (getOpId c) 2261 $
"Multiple redirections compete for " ++ str n ++ ". Combine, or use " ++ alternative ++ "." "Multiple redirections compete for " ++ str n ++ ". Use cat, tee, or pass filenames instead."
warnAboutDupes _ = return () warnAboutDupes _ = return ()
alternative = alternative =