diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2016-10-05 20:17:06 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-10-05 20:23:58 +0200 |
commit | db357667bc8a9b9379f5e9171838d87a510e77a8 (patch) | |
tree | 4b5de9634f9cedb7dbc1414e3fbceff9a6d86073 /script | |
parent | 94d565b957bebf8a131cd4130f93eed98a20d008 (diff) | |
download | libgit2-db357667bc8a9b9379f5e9171838d87a510e77a8.tar.gz |
travis: take the newer ssh-keygen format into accountcmn/osx-ssh-key
The Mac machines have updated their SSH version and so the ssh-keygen
format has changed. Ask it for MD5, which is the one that is output as
hex.
Diffstat (limited to 'script')
-rwxr-xr-x | script/cibuild.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/script/cibuild.sh b/script/cibuild.sh index 0ec295198..b13ad88c4 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -51,8 +51,13 @@ ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q cat ~/.ssh/id_rsa.pub >>~/.ssh/authorized_keys ssh-keyscan -t rsa localhost >>~/.ssh/known_hosts -# Get the fingerprint for localhost and remove the colons so we can parse it as a hex number -export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') +# Get the fingerprint for localhost and remove the colons so we can parse it as +# a hex number. The Mac version is newer so it has a different output format. +if [ "$TRAVIS_OS_NAME" = "osx" ]; then + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -E md5 -F localhost -l | tail -n 1 | cut -d ' ' -f 3 | cut -d : -f2- | tr -d :) +else + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') +fi export GITTEST_REMOTE_URL="ssh://localhost/$HOME/_temp/test.git" export GITTEST_REMOTE_USER=$USER |