LittleNellie/cipherscan
2
0
Fork 0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00
Code Issues Releases Wiki Activity

Merge pull request #50 from firstbanco/busybox_fix

Browse Source 
Fix for busybox timeout binary
This commit is contained in:
Julien Vehent 2015-03-26 12:58:48 -04:00
commit 089f9e04c2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cipherscan
View File

@ -27,6 +27,7 @@ fi
# test that timeout or gtimeout (darwin) are present # test that timeout or gtimeout (darwin) are present
TIMEOUTBIN="$(which timeout)" TIMEOUTBIN="$(which timeout)"
if [ "$TIMEOUTBIN" == "" ]; then if [ "$TIMEOUTBIN" == "" ]; then
TIMEOUTBIN="$(which gtimeout)" TIMEOUTBIN="$(which gtimeout)"
if [ "$TIMEOUTBIN" == "" ]; then if [ "$TIMEOUTBIN" == "" ]; then
@ -35,6 +36,12 @@ if [ "$TIMEOUTBIN" == "" ]; then
fi fi
fi fi
# Check for busybox, which has different arguments
TIMEOUTOUTPUT=$(($TIMEOUTBIN --help) 2>&1)
if [[ "$TIMEOUTOUTPUT" =~ BusyBox ]]; then
TIMEOUTBIN="$TIMEOUTBIN -t"
fi
# find a list of trusted CAs on the local system, or use the provided list # find a list of trusted CAs on the local system, or use the provided list
if [ -z "$CACERTS" ]; then if [ -z "$CACERTS" ]; then
for f in /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt; do for f in /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt; do