Repository navigation
Commit 2d43b41
committed
travis: take the newer ssh-keygen format into account
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.1 parent 94d565b commit 2d43b41
1 file changed
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -51,8 +51,13 @@ ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q | |||
| 51 | 51 | cat ~/.ssh/id_rsa.pub >>~/.ssh/authorized_keys | |
| 52 | 52 | ssh-keyscan -t rsa localhost >>~/.ssh/known_hosts | |
| 53 | 53 | ||
| 54 | - # Get the fingerprint for localhost and remove the colons so we can parse it as a hex number | ||
| 55 | - export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') | ||
| 54 | + # Get the fingerprint for localhost and remove the colons so we can parse it as | ||
| 55 | + # a hex number. The Mac version is newer so it has a different output format. | ||
| 56 | + if [ "$TRAVIS_OS_NAME" = "osx" ]; then | ||
| 57 | + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -E md5 -F github.com -l | tail -n 1 | cut -d ' ' -f 3 | cut -d : -f2- | tr -d :) | ||
| 58 | + else | ||
| 59 | + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') | ||
| 60 | + fi | ||
| 56 | 61 | ||
| 57 | 62 | export GITTEST_REMOTE_URL="ssh://localhost/$HOME/_temp/test.git" | |
| 58 | 63 | export GITTEST_REMOTE_USER=$USER | |
0 commit comments