look for gsha* commands, as installed on some OS's that think "GNU" is nonstandard

This commit is contained in:
Joey Hess 2012-11-09 11:27:50 -04:00
parent 6eee4bd5f1
commit 94ccfc92f9

View file

@ -36,7 +36,9 @@ tests =
, (384, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b") , (384, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")
] ]
{- shaNsum are the program names used by coreutils. {- shaNsum are the program names used by coreutils. Some systems like OSX
- sometimes install these with 'g' prefixes.
-
- On some systems, shaN is used instead, but on other - On some systems, shaN is used instead, but on other
- systems, it might be "hashalot", which does not produce - systems, it might be "hashalot", which does not produce
- usable checksums. Only accept programs that produce - usable checksums. Only accept programs that produce
@ -50,9 +52,9 @@ shaTestCases l = map make l
where where
key = "sha" ++ show n key = "sha" ++ show n
check = "</dev/null | grep -q '" ++ knowngood ++ "'" check = "</dev/null | grep -q '" ++ knowngood ++ "'"
shacmds n = concatMap (\x -> [x, osxpath </> x]) $ shacmds n = concatMap (\x -> [x, 'g':x, osxpath </> x]) $
map (\x -> "sha" ++ show n ++ x) ["sum", ""] map (\x -> "sha" ++ show n ++ x) ["sum", ""]
{- Max OSX puts GNU tools outside PATH, so look in {- Max OSX sometimes puts GNU tools outside PATH, so look in
- the location it uses, and remember where to run them - the location it uses, and remember where to run them
- from. -} - from. -}
osxpath = "/opt/local/libexec/gnubin" osxpath = "/opt/local/libexec/gnubin"