Add support for macOS Sierra ssh-keygen

Author: terrorobe

share/github-backup-utils/ghe-detect-leaked-ssh-keys

@@ -48,7 +48,7 @@ if [ -n "$ppid_script" ]; then
 fi
 
 sshkeygen_multiple_hash_formats=false
-if (ssh-keygen -E 2>&1 | head -1 |  grep -q 'option requires an argument'); then
+if (ssh-keygen --a-dedicated-help-flag-would-be-great 2>&1 | grep 'ssh-keygen -l ' | grep -q -- '-E'); then
   sshkeygen_multiple_hash_formats=true
 fi
 
@@ -78,7 +78,11 @@ for tar_file in $ssh_tars; do
     if $(tar -tvf "$tar_file" $key &>/dev/null); then
       tar -C $TEMPDIR -xvf "$tar_file" $key &>/dev/null
       if $sshkeygen_multiple_hash_formats; then
+<<<<<<< HEAD
         fingerprint=$(ssh-keygen -l -E md5 -f $TEMPDIR/$key | cut -d ' ' -f 2 | cut -f 2- -d ':')
+=======
+        fingerprint=$(ssh-keygen -l -E md5 -f $TEMPDIR/$key | cut -d ' ' -f 2 | cut -f2- -d':')
+>>>>>>> a3fac8e... add support for macOS Sierra ssh-keygen
       else
         fingerprint=$(ssh-keygen -lf $TEMPDIR/$key | cut -d ' ' -f 2)
       fi