diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-09 11:27:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-09 11:27:50 -0400 |
| commit | 8b803528acce573c09c150b3f635cbdd88cedbd0 (patch) | |
| tree | bd99337ebfa7cf4d510e6cf29e3665120619e3af /Build/Configure.hs | |
| parent | 0a341ab29e0d3231ac350f49f982f821f2dbb743 (diff) | |
look for gsha* commands, as installed on some OS's that think "GNU" is nonstandard
Diffstat (limited to 'Build/Configure.hs')
| -rw-r--r-- | Build/Configure.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index 96582f923..b003ab6be 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -36,7 +36,9 @@ tests = , (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 - systems, it might be "hashalot", which does not produce - usable checksums. Only accept programs that produce @@ -50,9 +52,9 @@ shaTestCases l = map make l where key = "sha" ++ show n 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", ""] - {- 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 - from. -} osxpath = "/opt/local/libexec/gnubin" |