Merge branch 'two-factor'

ctrueden · ctrueden · commit fb3bc450087d · 2014-04-18T14:41:33.000-05:00
This branch adds support for GitHub two-factor authentication to the
add-default-github-hooks.sh script.
diff --git a/add-default-github-hooks.sh b/add-default-github-hooks.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Use this script to add the IRC and Jenkins webhooks to the GitHub repositories.
-# You will need to add credentials to your $HOME/.netrc for this to work.
+# You will need to add credentials to your $HOME/.netrc for this to work. And if
+# you use two-factor authentication, you'll also need to pass GITHUB_TWO_FACTOR.
 
 die () {
 	echo "$*" >&2
@@ -13,19 +14,24 @@ die "Usage: $0 <org>/<repository>"
 
 repository="$1"
 
+TWO_FACTOR_HEADER="${GITHUB_TWO_FACTOR:+X-GitHub-OTP: }$GITHUB_TWO_FACTOR"
+mycurl () {
+	curl --netrc --header "$TWO_FACTOR_HEADER" "$@" "$url"
+}
+
 url="https://api.github.com/repos/$repository/hooks"
-hooks="$(curl --netrc "$url")"
+hooks="$(mycurl)"
 
 # IRC
 if ! echo "$hooks" | grep '^    "name": "irc",$'
 then
 	echo "Adding IRC hook"
-	curl --netrc -XPOST -d '{"name":"irc","active":true,"events":["push","pull_request"],"config":{"server":"irc.freenode.net","port":"6667","room":"#imagejdev","message_without_join":"1","notice":"1"}}' "$url"
+	mycurl -XPOST -d '{"name":"irc","active":true,"events":["push","pull_request"],"config":{"server":"irc.freenode.net","port":"6667","room":"#imagejdev","message_without_join":"1","notice":"1"}}'
 fi
 
 # Jenkins
 if ! echo "$hooks" | grep '^    "name": "jenkinsgit",$'
 then
 	echo "Adding Jenkins hook"
-	curl --netrc -XPOST -d '{"name":"jenkinsgit","active":true,"events":["push"],"config":{"jenkins_url":"http://jenkins.imagej.net/"}}' "$url"
+	mycurl -XPOST -d '{"name":"jenkinsgit","active":true,"events":["push"],"config":{"jenkins_url":"http://jenkins.imagej.net/"}}'
 fi
