Fix various bugs exposed by actually making a release

letsencrypt/cli.py

@@ -881,7 +881,7 @@ def prepare_and_parse_args(plugins, args):
         version="%(prog)s {0}".format(letsencrypt.__version__),
         help="show program's version number and exit")
     helpful.add(
-        "automation", "--renew-by-default", action="store_true",
+        "automation", "--renew-by-default", "--replace", action="store_true",
         help="Select renewal by default when domains are a superset of a "
              "previously attained cert")
     helpful.add(

tools/dev-release.sh

@@ -62,7 +62,9 @@ echo "Cloning into fresh copy at $root"  # clean repo = no artificats
 git clone . $root
 git rev-parse HEAD
 cd $root
-git branch -f "$RELEASE_BRANCH"
+if [ "$RELEASE_BRANCH" != master ] ; then
+    git branch -f "$RELEASE_BRANCH"
+fi
 git checkout "$RELEASE_BRANCH"
 
 for pkg_dir in $SUBPKGS
@@ -71,7 +73,7 @@ do
 done
 sed -i "s/^__version.*/__version__ = '$version'/" letsencrypt/__init__.py
 
-git add -p  # interactive user input
+git add -p $SUBPKGS # interactive user input
 git commit --gpg-sign="$RELEASE_GPG_KEY" -m "Release $version"
 git tag --local-user "$RELEASE_GPG_KEY" \
     --sign --message "Release $version" "$tag"
@@ -89,7 +91,7 @@ do
   echo "Signing ($pkg_dir)"
   for x in dist/*.tar.gz dist/*.whl
   do
-      gpg2 --detach-sign --armor --sign $x
+      gpg -u "$RELEASE_GPG_KEY" --detach-sign --armor --sign $x
   done
 
   cd -

tools/dev-release2.sh

@@ -39,7 +39,10 @@
 # Create a GitHub issue with the release information, ask someone to
 # pull in the tag.
 
-script --return --command ./tools/dev-release.sh log
+RELEASE_GPG_KEY=A2CFB51FA275A7286234E7B24D17C995CD9775F2
+export GPG_TTY=$(tty)
+
+#script --return --command ./tools/dev-release.sh log
 
 root="$(basename `grep -E '^/tmp/le' log | head -n1 | tr -d "\r"`)"
 root_without_le="${root##le.}"
@@ -48,4 +51,4 @@ ext="${root_without_le##*.}"
 rev="$(git rev-parse --short HEAD)"
 cp -r /tmp/le.$name.$ext/ $name.$rev
 tar cJvf $name.$rev.tar.xz log $name.$rev
-gpg --detach-sign --armor $name.$rev.tar.xz
+gpg -U $RELEASE_GPG_KEY --detach-sign --armor $name.$rev.tar.xz