-
Paul Irish committed with GitHub 7 years ago
Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)
-
-
skipped 91 lines 92 92 else 93 93 # custom GitLab 94 94 gitlab_domain=$(git config --get gitopen.gitlab.domain) 95 - gitlab_port=$(git config --get gitopen.gitlab.port) 95 + gitlab_ssh_domain=$(git config --get gitopen.gitlab.ssh.domain) 96 + gitlab_ssh_domain=${gitlab_ssh_domain:-$gitlab_domain} 97 + gitlab_ssh_port=$(git config --get gitopen.gitlab.ssh.port) 96 98 if [ -n "$gitlab_domain" ]; then 97 - if grep -q "$gitlab_domain" <<<$giturl; then 99 + if egrep -q "${gitlab_domain}|${gitlab_ssh_domain}" <<<$giturl; then 98 100 99 101 # Handle GitLab's default SSH notation (like [email protected]:user/repo) 100 - giturl=${giturl/git\@${gitlab_domain}\:/https://${gitlab_domain}/} 102 + giturl=${giturl/git\@${gitlab_ssh_domain}\:/https://${gitlab_domain}/} 101 103 102 104 # handle SSH protocol (links like ssh://[email protected]/user/repo) 103 105 giturl=${giturl/#ssh\:\/\//https://} 104 106 105 107 # remove git@ from the domain 106 - giturl=${giturl/git\@${gitlab_domain}/${gitlab_domain}/} 108 + giturl=${giturl/git\@${gitlab_ssh_domain}/${gitlab_domain}/} 107 109 108 110 # remove SSH port 109 - if [ -n "$gitlab_port" ]; then 110 - giturl=${giturl/\/:${gitlab_port}\///} 111 + if [ -n "$gitlab_ssh_port" ]; then 112 + giturl=${giturl/\/:${gitlab_ssh_port}\///} 111 113 fi 112 114 providerUrlDifference=tree 113 115 fi skipped 30 lines