Merge ~paelzer/ubuntu-helpers:os-import-for-focal into ~paelzer/ubuntu-helpers:master

[Christian Ehrhardt ]

[Bryce Harrington (bryce)]

Guessing this MP is for c51ab9e only (which LGTM, +1).

However, one suggestion for the prior commit, 857c838; I was just some wget url code myself yesterday and saw a good tip on stack exchange that when downloading single files, curl seems better to use in scripts than wget.

Anyway, if you end up using migration-filter for something I'd be keen to hear about it.

[Bryce Harrington (bryce)]

review: Approve

[Christian Ehrhardt  (paelzer)]

Yeah just for that commit (merged it now) - thanks.

I can easily use curl, but I do not see a benefit of curl>wget do you have link handy why that would be "better"?

Finally migration-filter - I used "single-build-failures" to look for candidates to fix and realized to late it exists.
Otherwise excuses-top-blocker.sh might have become an extension to your tool.

If we'd be on feature requests, "at least older than" and "not older than" would be nice to add to filters. If too young then they are likely fixed by Debian, too old often is unfixable for some reason.

[Bryce Harrington (bryce)]

I have a lot more experience with wget than curl, and have mostly used the former including in scripts. Guessing your experience has been similar.

wget has a definite advantage when you're downloading multiple files from a website, or doing things recursively. But for single-file downloads, the advantage I'm seeing on using curl is that it gives better low-level control and generally seems more robust when you're using in a scripted fashion. Curl seems to also be (slightly) faster, and provide more discrete error codes, which could be useful in a script.

Anyway, no biggie but just FYI that at least for my own purposes I'll probably be switching to curl over wget for scripted things myself.

Some links:
  * https://unix.stackexchange.com/questions/47434/what-is-the-difference-between-curl-and-wget
  * https://daniel.haxx.se/docs/curl-vs-wget.html

diff --git a/.gitignore b/.gitignore
 new file mode 100644
index 0000000..d32ac33
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/build/
+/dist/
+
+*.snap
+
+# Logs
+*-debug.log
+*-error.log
diff --git a/README.md b/README.md
 new file mode 100644
index 0000000..8ab8a50
--- /dev/null
+++ b/README.md
@@ -0,0 +1,218 @@
+# Ubuntu Server Tooling collection
+
+This is a collection of tools used by different team members of the
+Ubuntu server team. The purpose of this repository is to reduce the re-creation
+of such tools over and over again.
+
+We start with a per-user subdirectory as historically people have diverged
+the very same tools. The intention is to unify some things over time.
+
+All tools are as-is and without any guarantees.
+
+This file shall give an overview what these tools actually do to allow
+exploring and evaluating them more easily.
+
+## Proposed migration work
+
+* cpaelzer/check-autopkgtest-stats.sh
+Check the past of a packages autopkgtest success rate and scan for a given
+pattern in those fails. Most useful when debugging if a certain issue
+comes back but hiding between other errors.
+It will list which sub-test failed and visually show the frequency of those.
+Example: `$ check-autopkgtest-stats.sh -c 40 -p libreoffice -r xenial -a amd64 -P 'gb_JunitTest_DEBUGRUN'`
+will give you some stats plus `1 junit-subsequentcheck            (  2.50%) ....................F..................`
+
+* cpaelzer/check-component-mismatches.sh
+Run this against a link to a buildlog on launchpad - e.g. where you prep
+your shiny new package/version for main.
+It tries to identify dependencies of that build into non-main.
+
+* cpaelzer/check-component-mismatches-v2.sh
+Like the checker above, but instead of a buildlog just run it with a package
+name. Preferrably in a container with the target release.
+
+* cpaelzer/lp-affects-devel
+Mark a bug affected by a given package/release combo.
+Example: `$ lp-affects-devel 1863108 postgresql-9.5 xenial`
+
+* cpaelzer/lp-test-ppa
+Trigger and report autopkgtests on a PPA
+Example: `$ ./lp-test-ppa ppa:ci-train-ppa-service/4318 hirsute`
+
+* cpaelzer/rma
+Rmadison to Debian and Ubuntu at once to compare versions with each other.
+
+* cpaelzer/testify.sh
+Insert all autopkgtest architectures into a autopkgtest retry link
+
+* rbasak/chdist-if-migrated
+Simulate proposed migration for a set of packages so that you can then
+poke apt-get to see why britney says something will become
+uninstallable.
+
+## Package subscriptions by Teams
+
+* cpaelzer/get-packages-subscribed.py
+List packages a team is subscribed to (e.g. for MIR processing)
+
+* cpaelzer/check-OS-packages-on-server-mapping.sh
+Due to the team split in the past we have some overlap that we need to
+clear on a regular base. Finds packages subscribed by both teams.
+
+* cpaelzer/packageset-subscription-mismatches.sh
+Find packages subscribed but not in main (candiate to drop) and packages
+in server packageset (uploads) but not subscribed (candidate to clear either)
+
+## Updating Packages
+
+* cpaelzer/dput
+Break on common errors before uploading them
+
+* cpaelzer/git-to-dquilt.sh
+Convert a git commit into a debian/patches/ entry.
+Automatically adds dep3 headers, date and bug.
+Can work on multiple commits at once and trivializes bug-fixing.
+Note: you need to add the upstream remote beofre you can pick patches from
+there.
+Example:
+  git-to-dquilt.sh -b 1895366 -p "ubuntu-v3.0.3-fixes" -u 'https://github.com/corosync/corosync/commit/' 7f64a1dc ec889e89 9105d94a 21e1c711 ee38d93c f31a31f9
+
+* cpaelzer/sbuildchroot
+Enter an sbuild chroos without having to remember the /...../ path.
+
+* cpaelzer/localrepo.sh
+If you have a bunch of local debs e.g. from a sbuild run this will create
+and sign the necesary files to include it as a local repository.
+
+* cpaelzer/pull-uca-source.py
+Like pull-lp-source but for Ubuntu cloud archive
+
+## Virtualization stack special cases
+
+* cpaelzer/locallibvirt.sh
+Helps to build libvirt locally close to what we usually build for Ubuntu
+releases.
+
+* cpaelzer/buildpkg-qemu.sh
+Qemu had some serious mismatches between git and tarballs prior to Eoan.
+This helps to clean up before build and restore the proper content.
+
+## Packaging VCS management
+
+* rbasak/adopt.py
+Adopt non-VCS uploads made by other Ubuntu developers into your package
+maintenance VCS by making use of the synthesized git-ubuntu view.
+
+## Packaging/Container related tools:
+
+* bryce/ls-installed - dump list of what unique packages are installed
+* bryce/ls-lxc - list all lxc containers
+* bryce/rmad - look up debian and ubuntu versions of a package
+* bryce/dependency-tree - organize list of packages in revdep order
+* bryce/enable-debsrc - uncomments deb-src entries in sources.list*
+
+## Git branch review related tools:
+
+I don't find myself using these for Ubuntu packaging, but they proved
+handy when doing upstream maintenance work, esp. for reviewing large git
+branch MP's.
+
+* bryce/git-cmp-branches - diff branches
+* bryce/git-cmp-repos - diff entire repos
+* bryce/git-exam - dump git changes to a given file
+* bryce/git-grep - greps for a string within a range of commits
+* git-log-branch - pretty formatted log graph
+* bryce/git-pop - removes top commit (saved to /tmp/)
+
+## X11 / Desktop cli's:
+
+* bryce/middle-paste - I map this to ctrl+alt+v to simulate middle-paste
+
+## Basic Unix-style commands I've added to my workflow:
+
+* bryce/binit - Symlink a script into ~/bin, but keeps actual file in whatever
+  VCS I'm using.
+* bryce/columns - Extract columns from text tables.  (I have a python version
+  of this but it's still a WIP.)
+* bryce/mv-smart - avoid clobbering existing files unless they're identical
+* bryce/prepend - Inserts file content at top of files
+* bryce/shuffle - Randomizes lines using python's random.shuffle()
+
+
+## Externally hosted things:
+
+* bryce/post-discourse:  CLI tool for interacting with Discourse
+  - https://gitlab.com/bryceharrington/post-discourse
+
+* bryce/launchpad-gm-scripts: Firefox enhancements for bug report triaging and
+  other launchpad-related work.
+  - https://launchpad.net/launchpad-gm-scripts
+
+* bryce/php-ubuntu-tools:  CLI for preparing for packageset transitions.
+  - https://code.launchpad.net/~php-ubuntu/+git/php-ubuntu-tools
+  - Currently pretty specific to PHP but could be repurposeable for
+    other kinds of transitions.
+  - Honestly is kind of a mess because transitions involve so many
+    different parts which change on a daily basis, so it's tough to
+    engineer a general solution.
+  - I'm thinking instead of trying to automate the full process, to
+    break it down into smaller helper scripts...
+
+## Misc
+
+* rbasak/standup_timer.py: used to time our standups.
+
+## Experiments / WIP:
+
+These are some side projects I own or help maintain, which aren't
+currently in an immediately useful state, but may be worth mentioning if
+others have similar needs/interests.
+
+* ppa-dev-tools:  CLI for creating PPAs.
+  - Create, list, delete, etc. PPAs
+  - https://launchpad.net/ppa-dev-tools
+
+* bryce/diskwatch:  Displays status of collection of hdd's, including their
+  serial numbers, bus location, raid details, etc.  Doesn't handle a
+  wide enough breadth of hardware, so still rather WIPish.
+  - https://gitlab.com/bryceharrington/diskwatch
+
+* bryce/python-fstab: Python module for managing fstab contents.
+  - Originally written by Lars Wirzenius, but seems unmaintained now.
+  - My hope was to use something off-the-shelf but what I've found
+    unfortunately doesn't meet my requirements.  This came closest.
+  - Note:  I've ported it to python3 but still buggy, not quite ready
+    for prime time.
+  - https://code.launchpad.net/~bryce/python-fstab/+git/python-fstab
+
+* bryce/python-bullettree: Python module for managing Debian-changelog style
+  bullet lists (* / - / +).  Super early in development.
+  - https://gitlab.com/bryceharrington/bullet-tree
+
+* bryce/usmerges: Email service to look for merge opportunities.
+  - Not posted publically yet
+  - Kind of an agglomeration of quick hacks; I want to rewrite it with
+    test cases, proper python modules, and a less organic structure.
+
+* bryce/usdaily: A CLI for interacting with the ubuntu server team's trello
+  board.
+  - I've got some POC code implemented, but nothing shareable yet.
+
+
+## Wishlist:
+
+These are ideas for tools that I'd like, but haven't found anywhere, and
+am considering creating some day, maybe.
+
+* bryce/excuses-kicker: Tool for mass-retargeting autopkgtest runs, similar in
+  concept to retry-autopkgtest-regressions, but in bash.
+  - Handles acquisition of credentials through SSO/2FA, but is pretty
+    hacky.
+  - Planning to rewrite this in python
+  - Planning to build on top of retry-autopkgtest-regressions
+
+* bryce/python-apt-sources: Python module for managing /etc/apt/sources.list
+  and sources.list.d/
+  - There are chunks of code that parse or write these.  I need
+    something that can read *and* write, and that is packaged in a
+    discrete python module.
diff --git a/bryce/binit b/bryce/binit
 new file mode 100755
index 0000000..47bb24e
--- /dev/null
+++ b/bryce/binit
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+for item in $* ; do
+    if [ ! -e ${item} ]; then
+	echo "Error: No such file '${item}'"
+	continue
+    fi
+    path=$(realpath ${item})
+    tool=$(basename ${path})
+    if [ -e ~/bin/$tool ]; then
+	echo "Error: $tool already in ~/bin"
+	continue
+    fi
+    ln -s $path ~/bin/$tool
+    echo "linked ~/bin/$tool"
+done
+
diff --git a/bryce/check-scripts b/bryce/check-scripts
 new file mode 100755
index 0000000..ef656f3
--- /dev/null
+++ b/bryce/check-scripts
@@ -0,0 +1,100 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# Do some basic compile/lint style checks on scripts of various
+# programming languages.
+
+# Copyright (C) 2020 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [scripts]
+EOF
+    exit "${1}"
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+function check_script_bash() {
+    local code_file="${1}"
+
+    bash -n "${code_file}"
+    shellcheck "${code_file}"
+}
+
+function check_script_python() {
+    local code_file="${1}"
+
+    python3 -m py_compile "${code_file}"
+    if [ -e "${code_file}c" ]; then
+	rm "${code_file}c"
+    fi
+    pyflakes3 "${code_file}"
+    pylint "${code_file}"
+}
+
+function check_code_c() {
+    local code_file="${1}"
+    die "${FUNCNAME[0]}: Unimplemented"
+}
+
+function check_code_cpp() {
+    local code_file="${1}"
+    die "${FUNCNAME[0]}: Unimplemented"
+}
+
+main() {
+    # TODO: If no args given, check all scripts in CWD
+
+    for code_file in "${@}"; do
+	code_file=$(realpath "${code_file}")
+	file_type=$(file -b "${code_file}")
+
+	case ${file_type,,} in
+	    *bash*)
+		check_script_bash "${code_file}"
+		;;
+	    *bourne*)
+		check_script_bash "${code_file}"
+		;;
+	    *python*script*)
+		check_script_python "${code_file}"
+		;;
+	    *c++*source*)
+		check_code_cpp "${code_file}"
+		;;
+	    *c*source*)
+		check_code_c "${code_file}"
+		;;
+	    *)
+		warn "Unknown script type '${file_type}' for ${code_file}"
+	esac
+    done
+}
+
+if [[ "${0}" == "${BASH_SOURCE[0]}" ]]; then
+    main "$@"
+fi
diff --git a/bryce/cl-diff b/bryce/cl-diff
 new file mode 100755
index 0000000..f87b174
--- /dev/null
+++ b/bryce/cl-diff
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+git diff debian/changelog \
+    | grep '^+  ' \
+    | sed 's/^../   /' \
+    | sed 's/   \* /   - /' \
+    | sed 's/     \- /     + /'
diff --git a/bryce/columns b/bryce/columns
 new file mode 100755
index 0000000..b36455f
--- /dev/null
+++ b/bryce/columns
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+# -*- coding: utf-8 -*-
+
+my @fields = grep { $_ =~ /^\d+\+?$/ } sort @ARGV;
+
+while (<STDIN>) {
+    chomp;
+    $_ =~ s/^\s+//;
+    my @cols = split /\s+/, $_;
+    my $show_after = undef;
+    foreach my $field (@fields) {
+        if ($field =~ /\+$/) {
+            $field =~ s/\+//;
+            $show_after = $field;
+        }
+        next unless $field && $cols[$field-1];
+        print $cols[$field-1], ' ';
+    }
+    if ($show_after) {
+        $field = $show_after;
+        while ($field < $#cols+1) {
+            $field += 1;
+            print $cols[$field-1], ' ';
+        }
+    }
+    print "\n";
+}
diff --git a/bryce/debb b/bryce/debb
 new file mode 100755
index 0000000..c16456e
--- /dev/null
+++ b/bryce/debb
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# This is a convenience script for Ubuntu packagers to submit bug
+# reports to Debian, skipping some unnecessary steps, or checks that are
+# inappropriate for packagers (such as whether the package is
+# installed).
+
+attachments=
+package="${1}"
+if [ -n "${2}" ]; then
+    attachments="-A ${2}"
+fi
+
+reportbug ${attachments} \
+	  --bts debian \
+	  --email "${DEBEMAIL}" \
+	  --no-query-bts \
+	  --no-check-available \
+	  --no-check-installed \
+	  --no-config-files \
+	  --no-verify \
+	  --mutt \
+	  --source "${package}"
+
+# TODO: Provide version number as whatever the current debian version is
+# TODO: Allow linking to a launchpad bug report, that is being forwarded
diff --git a/bryce/debian-changes b/bryce/debian-changes
 new file mode 100755
index 0000000..0393d59
--- /dev/null
+++ b/bryce/debian-changes
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+package="${1}"
+p="${package:0:1}"
+
+# TODO: This misses lib*
+#       (I seem to recall seeing a script that handled this lookup logic...)
+
+wget -q -O- https://metadata.ftp-master.debian.org/changelogs//main/${p}/${package}/unstable_changelog | head -n 100 | less
+
+# TODO: Only show entries since whatever is in Ubuntu
+
+# TODO: Somehow provide way to view the diff for a given version
+#       (seems like a job for git-ubuntu?)
diff --git a/bryce/dependency-tree b/bryce/dependency-tree
 new file mode 100755
index 0000000..ffb7012
--- /dev/null
+++ b/bryce/dependency-tree
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Usage:  cat my-packages.txt | dependency-tree
+#
+#   - my-packages.txt could be generated via a command like:
+#
+#     $ apt-cache policy "php-horde-*" | grep "^[a-z]" | cut -d: -f1 > my-packages.txt
+
+# Note: This only works for php-horde.  To make it more generally usable
+# would need to give it a better way to filter dependencies (see TODO-1
+# and TODO-2).
+
+# Slurp in our package list from stdin
+unsorted_packages=
+while read pkg; do
+    # Also add the package's dependencies
+    # TODO-1: Need better way to extract the relevant rdepends without hardcoding "php-horde"
+    rdepends=$(apt-cache rdepends "${pkg}" --recurse \
+			 --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances \
+		   | grep "^  php-horde-" | grep -v php-horde-core | sort | uniq)
+    unsorted_packages="${unsorted_packages} ${pkg} ${rdepends}"
+done < "${1:-/dev/stdin}"
+
+# Sort ${package_list} to unique items
+package_list=$(echo -e "${unsorted_packages// /\\n}" | sort -u)
+
+seen_file=$(mktemp)
+level=0
+
+while [ -n "${package_list}" ]; do
+    echo "### Dependency Level ${level} ###"
+    remaining_packages=
+    for pkg in ${package_list}; do
+	apt-cache show "$pkg" 2>&1 | grep -q ^Package: || continue
+
+	# TODO-2: Ignore non-php-horde packages
+	depends=$(apt-cache rdepends "${pkg}" \
+		      --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances \
+		      | grep "^  php-horde-" | sort | uniq \
+		      | grep -vwFf "${seen_file}")
+	if [ -z "${depends}" ]; then
+	    echo "${pkg}"
+	    echo "${pkg}" >> "${seen_file}"
+	else
+	    remaining_packages="${remaining_packages} ${pkg}"
+	fi
+
+    done
+    if [ "${package_list}" = "${remaining_packages}" ]; then
+	echo
+	echo "### Error - Could not untangle dependencies: ###"
+	echo "${remaining_packages}"
+	exit 1
+    fi
+    package_list="${remaining_packages}"
+    level=$(( level + 1 ))
+    echo
+    echo
+done
diff --git a/bryce/enable-debsrc b/bryce/enable-debsrc
 new file mode 100755
index 0000000..eda532a
--- /dev/null
+++ b/bryce/enable-debsrc
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+from softwareproperties.SoftwareProperties import SoftwareProperties
+
+"""
+This script enables all deb-src entries in sources.list if the
+corresponding deb line has been enabled.
+"""
+
+if __name__ == "__main__":
+    sp = SoftwareProperties(options=None)
+    enabled_deb_entry = None
+    for entry in sp.sourceslist.list:
+        if entry.type == 'deb' and not entry.disabled:
+            enabled_deb_entry = entry
+        elif (entry.type == 'deb-src'
+              and entry.architectures == enabled_deb_entry.architectures
+              and entry.trusted == enabled_deb_entry.trusted
+              and entry.uri == enabled_deb_entry.uri
+              and entry.dist == enabled_deb_entry.dist
+              and entry.comps == enabled_deb_entry.comps):
+            entry.set_enabled(True)
+    sp.sourceslist.save()
+
+    os.execvp("apt-get", ["apt-get", "update"])
+    sys.exit(0)
diff --git a/bryce/enable-proposed b/bryce/enable-proposed
 new file mode 100755
index 0000000..e5f7006
--- /dev/null
+++ b/bryce/enable-proposed
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import aptsources
+from softwareproperties.SoftwareProperties import SoftwareProperties
+
+"""
+This script enables -proposed in sources.list for the current distro.
+"""
+
+def main_archive_uri(sp):
+    for entry in sp.sourceslist.list:
+        if (entry.type == 'deb'
+            and not entry.invalid
+            and not entry.disabled
+            and entry.dist == sp.distro.codename
+            and entry.file == '/etc/apt/sources.list'
+            and 'main' in entry.comps
+            and 'ppa.launchpad.net' not in entry.line):
+            return entry.uri
+
+if __name__ == "__main__":
+    sp = SoftwareProperties(options=None)
+    distro = aptsources.distro.get_distro()
+    distro.get_sources(sp.sourceslist)
+    dist = '{}-proposed'.format(sp.distro.codename)
+    uri = main_archive_uri(sp)
+    comps = list(distro.enabled_comps)
+    for t in 'deb', 'deb-src':
+        if not sp.sourceslist.add(type=t, uri=uri, dist=dist, orig_comps=comps):
+            print(_("Error: '%s' invalid") % line)
+            sys.exit(1)
+
+    sp.sourceslist.save()
+
+    os.execvp("apt-get", ["apt-get", "update"])
+    sys.exit(0)
diff --git a/bryce/git-cmp-branches b/bryce/git-cmp-branches
 new file mode 100755
index 0000000..0f12e8c
--- /dev/null
+++ b/bryce/git-cmp-branches
@@ -0,0 +1,7 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+a="${1}"
+b="${2}"
+
+git log "${a}" "^${b}" --no-merges
diff --git a/bryce/git-cmp-repos b/bryce/git-cmp-repos
 new file mode 100755
index 0000000..f40bd69
--- /dev/null
+++ b/bryce/git-cmp-repos
@@ -0,0 +1,27 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# Given two repositories, show the commits that differ
+
+a="${1}"
+b="${2}"
+
+cd "${a}"
+git log | grep "^commit " | cut -d' ' -f2 > /tmp/git-cmp-a.commits
+cd ..
+
+cd "${b}"
+i=0
+for commit in $(cat /tmp/git-cmp-a.commits); do
+    git show "${commit}" > /dev/null 2>&1
+    if [ $? != 0 ]; then
+        echo "${commit}"
+	id=$(printf "head-%03d_%s" "${i}" "${commit}")
+	cd ..
+	cd "${a}"
+	git show "${commit}" > "../${id}.patch"
+	cd ..
+	cd "${b}"
+	i=$(( i + 1 ))
+    fi
+done
diff --git a/bryce/git-exam b/bryce/git-exam
 new file mode 100755
index 0000000..83ccaf6
--- /dev/null
+++ b/bryce/git-exam
@@ -0,0 +1,45 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# For a given file, review the past changes to just that file
+
+FILENAME="${1}"
+
+# lexer = diff
+# formatters = raw, svg, terminal, terminal256, text
+# filters = whitespace, highlight
+# styles = monokai, manni, borland, colorful, default, murphy, trac, tango, fruity, autumn, bw, emacs, vim, pastie, friendly, native
+
+## diff.py lexer:
+#            (r' .*\n', Text),
+#            (r'\+.*\n', Generic.Inserted),
+#            (r'-.*\n', Generic.Deleted),
+#            (r'!.*\n', Generic.Strong),
+#            (r'@.*\n', Generic.Subheading),
+#            (r'([Ii]ndex|diff).*\n', Generic.Heading),
+#            (r'=.*\n', Generic.Heading),
+#            (r'.*\n', Text),
+
+## terminal.py formatter:
+#     Generic.Deleted:    ('red',        'red'),
+#     Generic.Inserted:   ('darkgreen',  'green'),
+#     Generic.Heading:    ('**',         '**'),
+#     Generic.Subheading: ('*purple*',   '*fuchsia*'),
+#     Generic.Prompt:     ('**',         '**'),
+
+## native.py style:
+#        Generic.Heading:    'bold #ffffff',
+#        Generic.Subheading: 'underline #ffffff',
+#	Generic.Deleted:    '#d22323',
+#        Generic.Inserted:   '#589819',
+#        Generic.Error:      '#d22323',
+
+PYG_OPTS="-O style=gitdiff"
+
+for commit in $(git rev-list HEAD -- "${FILENAME}"); do
+    git show "${commit}" -- follow "${FILENAME}" | cat
+done | pygmentize "${PYG_OPTS}" -f terminal256 -l "diff" | less -QR
+
+#done | highlight --out-format=xterm256  --src-lang=diff -s moria | less -QR
+#done | source-highlight -s diff -f | less -QR
+
diff --git a/bryce/git-grep b/bryce/git-grep
 new file mode 100755
index 0000000..f9ae166
--- /dev/null
+++ b/bryce/git-grep
@@ -0,0 +1,35 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# Greps for a string within a range of commits
+
+progname=$(basename ${0})
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} <pattern> <range>
+EOF
+}
+
+if [ "${1}" = "-h" ] || [ "${1}" = "--help" ]; then
+    usage
+    exit 0
+elif [[ ${#} -lt 2 ]]; then
+    usage
+    exit 1
+fi
+
+PATTERN="${1}"
+RANGE="${2}"
+
+for commit in $(git rev-list "${RANGE}"); do
+    matches=$(git show "${commit}" | grep "${PATTERN}")
+    if [ -z "${matches}" ]; then
+	continue
+    fi
+    echo
+    git show -s --oneline "${commit}" | cat
+    echo "$matches" | grep "${PATTERN}"
+    echo
+done
+
diff --git a/bryce/git-log-branch b/bryce/git-log-branch
 new file mode 100755
index 0000000..8f696c0
--- /dev/null
+++ b/bryce/git-log-branch
@@ -0,0 +1,4 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative master..HEAD
diff --git a/bryce/git-pop b/bryce/git-pop
 new file mode 100755
index 0000000..98b0c07
--- /dev/null
+++ b/bryce/git-pop
@@ -0,0 +1,24 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+progname=$(basename "${0}")
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname}
+EOF
+}
+
+if [ "${1}" = "-h" ] || [ "${1}" = "--help" ]; then
+    usage
+    exit 0
+fi
+
+# TODO: Check if we're on a branch with no upstream defined,
+#       and if so bail with an appropriate error.  Otherwise,
+#       the git reset will fail
+
+git format-patch -o /tmp master
+git reset --hard @{u}
+git status
+
diff --git a/bryce/gu-set-target b/bryce/gu-set-target
 new file mode 100755
index 0000000..2e53726
--- /dev/null
+++ b/bryce/gu-set-target
@@ -0,0 +1,108 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+# Makes the imported repository the default for that Ubuntu package in
+# Launchpad. This will allow git ubuntu clone to find the repository,
+# since it looks for the default.
+#
+# Process for handling an import request:
+# https://docs.google.com/document/d/1LimtZjV4ldeIK_IY9GngumacljhqRdiwIcgWlI1TFiY/edit#heading=h.x44nuoia544z
+
+from os.path import join
+import asyncio
+import tenacity
+import argparse
+from functools import lru_cache
+from launchpadlib.launchpad import Launchpad
+from xdg.BaseDirectory import xdg_config_home
+
+class Config:
+    HOME = xdg_config_home
+
+class Lp:
+    # Extraction of bileto's lp class.
+    # (See Pdbq for a more thorough implementation.)
+    _real_instance = None
+
+    def __init__(self, application_name, service=Launchpad, config=Config):
+        """Create a Launchpad service object."""
+        self._app_name = application_name
+        self._service = service
+        self._config = config
+
+    def _get_instance(self):
+        """Authenticate to Launchpad."""
+        return self._service.login_with(
+            application_name=self._app_name,
+            service_root='production',
+            allow_access_levels=['WRITE_PRIVATE'],
+            version='devel',  # Need devel for copyPackage.
+            credentials_file=join(self._config.HOME, '.launchpad.credentials'),
+        )
+
+    @property
+    def _instance(self):
+        """Cache LP object."""
+        if not self._real_instance:
+            self._real_instance = self._get_instance()
+        return self._real_instance
+
+    @property
+    @lru_cache()
+    def _api_root(self):
+        """Identify the root URL of the launchpad API."""
+        return self._instance.resource_type_link.split('#')[0]
+
+    def __getattr__(self, attr):
+        """Wrap launchpadlib so tightly you can't tell the difference."""
+        assert not attr.startswith('_'), "Can't getattr for %s" %(attr)
+        instance = super(Lp, self).__getattribute__('_instance')
+        return getattr(instance, attr)
+
+
+def create_parser():
+    """Sets up the command line parser object.
+
+    :rtype: argparse.ArgumentParser
+    :returns: parser object, ready to run <parser>.parse_args().
+    """
+    parser = argparse.ArgumentParser(
+        description='Makes an imported repository the default in Launchpad',
+        )
+    parser.add_argument(
+        'packages',
+        nargs=argparse.REMAINDER)
+    return parser
+
[e-mail](
+    retry=tenacity.retry_if_exception_type(KeyError),
+    wait=tenacity.wait_fixed(300),
+    )
+async def set_git_ubuntu_default_target(pkg):
+    """
+    Sets the default target for the given package.
+
+    :param str pkg: Name of source package.
+    """
+    lp = Lp('git-ubuntu')
+    repository = lp.git_repositories.getByPath(
+        path=f'~git-ubuntu-import/ubuntu/+source/{pkg}',
+        )
+    if repository is None:
+        print(f"{pkg} does not exist yet.  Waiting...")
+        raise KeyError(f"Repository for {pkg} not found")
+    lp.git_repositories.setDefaultRepository(
+        repository=repository,
+        target=lp.distributions['ubuntu'].getSourcePackage(name=pkg),
+    )
+    print(f"{pkg} set successfully")
+
+async def set_all_async_with_wait(pkgs):
+    await asyncio.gather(*[set_git_ubuntu_default_target(pkg) for pkg in pkgs])
+
+if __name__ == "__main__":
+    # Option handling
+    parser = create_parser()
+    args = parser.parse_args()
+
+    asyncio.run(set_all_async_with_wait(args.packages))
diff --git a/bryce/gu-whitelist b/bryce/gu-whitelist
 new file mode 100755
index 0000000..c0608f7
--- /dev/null
+++ b/bryce/gu-whitelist
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Process for handling an import request:
+# https://docs.google.com/document/d/1LimtZjV4ldeIK_IY9GngumacljhqRdiwIcgWlI1TFiY/edit#heading=h.x44nuoia544z
+
+remote_user="${GU_REMOTE_USER:-ubuntu}"
+remote_host="${GU_REMOTE_HOST}"
+cache_dir="${XDG_CACHE_HOME:-$HOME/.cache}"
+usd_git_repo="${GU_GIT_REPO:-$cache_dir/usd-importer-whitelist}"
+priority="${GU_PRIORITY:-5}"
+
+## Prints to stderr
+function info() {
+    echo "${@}" 1>&2
+}
+
+## Prints to stderr, prefixed by 'Error:'
+function error() {
+    echo "Error:  ${@}" 1>&2
+}
+
+## Prints to stderr, prefixed by 'Fatal:', and terminates with non-zero exit code
+function die() {
+    echo "Fatal:  ${@}" 1>&2
+    exit ${2:-1}
+}
+
+function remote_exec() {
+    local cmd="${1}"
+
+    # Send command via ssh to remote server
+    info "ssh ${remote_user}@${remote_host} ${cmd}"
+    ssh "${remote_user}@${remote_host}" "${cmd}"
+}
+
+# Verify the VPN is activated.  If not, error & suggest enabling it.
+info "Checking if VPN is enabled"
+if ! ping -c1 "${remote_host}"; then
+    die "Could not ping ${remote_host}.  Is VPN enabled?"
+fi
+
+# If repo doesn't exist, check it out
+if [ ! -d "${usd_git_repo}" ]; then
+    lp_user=$(git config gitubuntu.lpuser)
+    if [ $? != 0 ] || [ -z "${lp_user}" ]; then
+	die "Could not determine LP username (set via git config gitubuntu.lpuser=<username>)"
+    fi
+    git clone "git+ssh://${lp_user}@git.launchpad.net/usd-importer" "${usd_git_repo}" \
+	|| die "Could not clone usd-importer from launchpad"
+elif [ ! -d "${usd_git_repo}/.git" ]; then
+    die "${usd_git_repo} already exists but is not a valid git repository"
+fi
+
+cd "${usd_git_repo}" \
+    || die "Could not chdir ${usd_git_repo}"
+
+# Check for any local changes
+if [ -n "$(git diff --name-only)" ]; then
+    die "There are uncommitted changes in ${usd_git_repo}"
+elif [ -n "$(git log origin/master..HEAD)" ]; then
+    die "There are unpushed changes in ${usd_git_repo}"
+fi
+
+git pull \
+    || die "Could not fetch from remote"
+
+# TODO: Add option to pull changes from a merge proposal.  E.g.:
+#       https://code.launchpad.net/~brian-murray/usd-importer/+git/usd-importer/+merge/406471
+
+# See if last entry appears to be from current user.  If not, add comment
+# with attribution for the new entries.
+name=$(git config user.name)
+last_section=$(grep ^# gitubuntu/source-package-whitelist.txt | tail -n 1)
+if [ "${last_section}" != "Requested by ${name}" ]; then
+    echo "" >> gitubuntu/source-package-whitelist.txt
+    echo "# Requested by ${name}" >> gitubuntu/source-package-whitelist.txt
+fi
+
+num_added=0
+for package_name in ${@}; do
+    info "Whitelisting ${package_name}"
+    # Check if package is already in the whitelist
+    if grep "^${package_name}$" gitubuntu/source-package-whitelist.txt; then
+	info "+ ${package_name} is already in the whitelist."
+    else
+	# Append packages to whitelist
+	echo "${package_name}" >> gitubuntu/source-package-whitelist.txt
+	num_added=$(( num_added + 1 ))
+    fi
+done
+
+if [ ${num_added} -gt 0 ]; then
+    git commit -am "Add ${package_name} to the whitelist."
+    git show HEAD | cat
+    echo "Make any changes to HEAD locally, and commit."
+    echo "${usd_git_repo}"
+    echo -n "Push changes [yn]?  "
+    read ANSWER
+    [ "${ANSWER}" = 'y' ] || exit 1
+    git push
+else
+    info "+ No packages needed added to whitelist"
+    # Discard the request comment
+    git checkout gitubuntu/source-package-whitelist.txt
+fi
+
+remote_exec 'cd ~ubuntu/live-whitelist-blacklist-source/ && git pull'
+remote_exec 'sudo systemctl --no-block restart git-ubuntu-importer-service-poller'
+
+for package_name in ${@}; do
+    info "Requesting ${package_name} import"
+    sql="INSERT INTO request (srcpkg, timestamp, priority) VALUES ('${package_name}', $(date +%s), ${priority})"
+    info "+ Executing:  '${sql}'"
+    if ! remote_exec "sqlite3 /var/local/git-ubuntu/db \"${sql}\""; then
+	error "importing ${package_name}"
+    fi
+    sleep 1
+    info ""
+done
diff --git a/bryce/install-build-deps b/bryce/install-build-deps
 new file mode 100755
index 0000000..73a19f6
--- /dev/null
+++ b/bryce/install-build-deps
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+sudo apt-get install -y equivs
+sudo mk-build-deps \
+     --install \
+     --remove \
+     --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' \
+     ./debian/control
+
+sudo rm -f *-build-deps_*_amd64.buildinfo
+sudo rm -f *-build-deps_*_amd64.changes
diff --git a/bryce/json-check b/bryce/json-check
 new file mode 100755
index 0000000..69e4a0f
--- /dev/null
+++ b/bryce/json-check
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2012 Bryce Harrington
+# License:  http://www.opensource.org/licenses/mit-license.php
+
+import sys
+import json
+
+filename = sys.argv[1]
+s = open(filename).read()
+try:
+    j = json.loads(s)
+    errcode = 0
+    sys.stderr.write("PASS\n")
+except:
+    errcode = 1
+    sys.stderr.write("FAIL:  Invalid json\n")
+    raise
+sys.exit(errcode)
+
+
diff --git a/bryce/json-get b/bryce/json-get
 new file mode 100755
index 0000000..c667a64
--- /dev/null
+++ b/bryce/json-get
@@ -0,0 +1,43 @@
+#!/usr/bin/python3
+
+import sys
+import json
+import pprint
+
+if len(sys.argv) < 3:
+    print("usage: json-get <json-filename> [ALL|<path.in.data.structure>]")
+    sys.exit(1)
+
+filename = sys.argv[1]
+json_path = sys.argv[2]
+
+with open(filename) as json_data:
+    data = json.load(json_data)
+
+path_elements = json_path.split('.')
+
+if json_path != "ALL":
+    for i in path_elements:
+        if type(data) is dict:
+            data = data.get(i, None)
+        elif type(data) is list:
+            if i.isdigit():
+                data = data[int(i)]
+            elif '=' in i:
+                (key,value) = i.split('=', 2)
+                found = False
+                for item in data:
+                    if item[key] == value:
+                        data = item
+                        found = True
+                        break
+            else:
+                print(type(i))
+        else:
+            print(type(data))
+
+if type(data) is list or type(data) is hash:
+    pp = pprint.PrettyPrinter()
+    pp.pprint(data)
+else:
+    print(data)
diff --git a/bryce/ls-installed b/bryce/ls-installed
 new file mode 100755
index 0000000..98737e0
--- /dev/null
+++ b/bryce/ls-installed
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dpkg --get-selections | cut -f 1
diff --git a/bryce/ls-lxc b/bryce/ls-lxc
 new file mode 100755
index 0000000..0b569ea
--- /dev/null
+++ b/bryce/ls-lxc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+lxc list -c ns4b | grep -v '^\+' 
diff --git a/bryce/middle-paste b/bryce/middle-paste
 new file mode 100755
index 0000000..10786e2
--- /dev/null
+++ b/bryce/middle-paste
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+## This works, but results in system getting 
+#xdotool type --clearmodifiers "$(xsel)"
+
+xdotool mousedown --clearmodifiers 2
+xdotool mouseup 2
+xdotool keyup alt
+xdotool keyup ctrl
+xdotool keyup shift
+
+# --delay milliseconds
+ 
+
diff --git a/bryce/migration-filter b/bryce/migration-filter
 new file mode 100755
index 0000000..e772244
--- /dev/null
+++ b/bryce/migration-filter
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Author:  Bryce Harrington <[e-mail]>
+#
+# Copyright (C) 2020 Bryce W. Harrington
+#
+# Released under GNU AGPL or later, read the file 'LICENSE.AGPL' for
+# more information.
+
+import json
+import lzma
+import os
+import urllib.request
+import re
+import sys
+import yaml
+
+if '__file__' in globals():
+    sys.path.insert(0, os.path.realpath(
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")))
+
+URL = 'https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.yaml'
+
+def strip_html(raw_html):
+    re_html = re.compile('<.*?>')
+    return re.sub(re_html, '', raw_html)
+
+def excuses_to_issues(excuses):
+    for issue in excuses:
+        # Exclude administrivia text
+        if (issue.startswith("Migration status for") or
+            issue.startswith("Issues preventing migration:") or
+            issue.startswith("Additional info:") or
+            issue.endswith("days old") or
+            issue.endswith("autopkgtest delayed")):
+            continue
+        yield issue
+
+def arches_for_issue(issue):
+    re_arch = re.compile(r'\&arch=([^\&]*)\&')
+    for item in issue.split(','):
+        m = re_arch.search(item)
+        if m:
+            yield m.group(1)
+
+def filter_only_test_complete(sources):
+    """Exclude sources that still have 'Test in progress' status."""
+    for source in sources:
+        in_progress = False
+        for issue in excuses_to_issues(source['excuses']):
+            if 'Test in progress' in issue:
+                in_progress = True
+        if not in_progress:
+            yield source
+
+def filter_only_build_failures(sources):
+    """Exclude sources that have issues other than build failures."""
+    for source in sources:
+        has_build_issue = False
+        has_non_build_issue = False
+        source['suggested-actions'] = []
+        for issue in excuses_to_issues(source['excuses']):
+            # Valid build issues
+            if issue.startswith("missing build on"):
+                has_build_issue = True
+                url = issue.split('"')[1]
+                arch = url.split('/')[-1]
+                source['suggested-actions'].append({
+                    'command': None,
+                    'description': "Retry build for {}".format(arch),
+                    'url': url
+                })
+
+            # Other sorts of issues
+            else:
+                has_non_build_issue = True
+        if has_build_issue and not has_non_build_issue:
+            yield source
+
+def filter_only_autopkgtest_failures(sources):
+    """Exclude sources that have issues other than autopkgtest regressions"""
+    for source in sources:
+        has_autopkgtest_issue = False
+        has_non_autopkgtest_issue = False
+        source['suggested-actions'] = []
+        for issue in excuses_to_issues(source['excuses']):
+            # Valid test regressions
+            if issue.startswith("autopkgtest for"):
+                package = issue.split(' ')[2].rstrip(':').split('/')[0]
+
+                regressions = ' '.join(issue.split(' ')[3:])
+                for r in regressions.split(', '):
+                    test_link_html = r.split(': ')[0].rstrip(': ')
+                    test_url = test_link_html.split('"')[1]
+                    test_arch = strip_html(test_link_html)
+
+                    test_status_html = r.split(': ', 1)[1]
+                    test_status_url = test_status_html.split('"')[1]
+                    test_status = strip_html(test_status_html)
+
+                    if test_status.startswith('Regression'):
+                        source['suggested-actions'].append({
+                            'command': "excuses-kicker --architecture {} {}".format(test_arch, package),
+                            'description': "Retry test(s) for {} on {}".format(package, test_arch),
+                            'arch': test_arch,
+                            'url': test_url,
+                            'status': test_status
+                        })
+                        has_autopkgtest_issue = True
+
+            # Other sorts of issues
+            else:
+                has_non_autopkgtest_issue = True
+        if has_autopkgtest_issue and not has_non_autopkgtest_issue:
+            yield source
+
+def filter_single_issue(sources):
+    """Excludes sources that have more than one issue listed."""
+    for source in sources:
+        num_issues = 0
+        for issue in excuses_to_issues(source['excuses']):
+            num_issues += 1
+            if num_issues > 1:
+                break
+        if num_issues == 1:
+            yield source
+
+def filter_single_arch(sources):
+    """Excludes sources that affect more than a single architecture."""
+    arch_sources = []
+    for source in sources:
+        arch = None
+        for issue in excuses_to_issues(source['excuses']):
+            arches = list(arches_for_issue(issue))
+            if arch is None and len(arches) == 1:
+                arch = arches[0]
+                arch_sources.append(source)
+            elif arches == [arch]:
+                arch_sources.append(source)
+
+    return arch_sources
+
+def main():
+    import sys
+    import argparse
+
+    # Option handling
+    parser = argparse.ArgumentParser(description='Query subsets of the proposed migration update excuses')
+    parser.add_argument(
+        '-j', '--json',
+        action='store_true',
+        help='Output a JSON data file',
+        default=False
+    )
+    parser.add_argument(
+        '-T', '--total',
+        action='store_true',
+        help='Print the total count of source packages satisfying filter criteria',
+        default=False
+    )
+    parser.add_argument(
+        'filter', nargs=argparse.REMAINDER,
+        help='Name of the filter to run'
+    )
+    args = parser.parse_args()
+
+    # TODO: Load from cached JSON file (query-
+    with urllib.request.urlopen(URL) as f:
+        # Use C implementation of the SafeLoader, which is faster for
+        # large files like this one.
+        migrations = yaml.load(lzma.decompress(f.read()), Loader=yaml.CSafeLoader)
+
+    generation_timestamp = migrations['generated-date']
+    sources = migrations['sources']
+
+    results = []
+    if 'all' in args.filter or args.filter == []:
+        results = sources
+    elif 'single-build-failures' in args.filter:
+        results = list(
+            filter_single_issue(
+                filter_only_build_failures(sources)
+            )
+        )
+    elif 'single-test-regressions' in args.filter:
+        results = list(
+            filter_single_arch(
+                filter_single_issue(
+                    filter_only_autopkgtest_failures(
+                        filter_only_test_complete(sources)
+                    )
+                )
+            )
+        )
+    else:
+        print("Error: Unknown filters")
+        sys.exit(1)
+
+    if args.json:
+        print(json.dumps(
+            results,
+            sort_keys=True,
+            indent=4,
+        ))
+    elif args.total:
+        print("{} update excuse records found".format(len(results)))
+    else:
+        for result in results:
+            print("* {}:".format(result.get('item-name')))
+            for action in result.get('suggested-actions', []):
+                print("  - {}".format(action.get('description')))
+                print("    {}".format(action.get('url')))
+                print("    $ {}".format(action.get('command')))
+
+if __name__ == '__main__':
+    main()
diff --git a/bryce/monday-triage b/bryce/monday-triage
 new file mode 100755
index 0000000..248489c
--- /dev/null
+++ b/bryce/monday-triage
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+triagers=(paelzer bryce paride utkarsh rbasak lucas sergio)
+num_triagers=7
+week=$(($(date +%V) + 1))
+week=${week##0}
+week=${week##+(0)}
+current=$((week % num_triagers))
+echo "Current:   " ${triagers[${current}]}
+echo "Next week: " ${triagers[$(( (current + 1) % num_triagers))]}
+echo "2 weeks:   " ${triagers[$(( (current + 2) % num_triagers))]}
+echo "3 weeks:   " ${triagers[$(( (current + 3) % num_triagers))]}
+echo "4 weeks:   " ${triagers[$(( (current + 4) % num_triagers))]}
+echo "5 weeks:   " ${triagers[$(( (current + 5) % num_triagers))]}
diff --git a/bryce/mv-smart b/bryce/mv-smart
 new file mode 100755
index 0000000..f1cc987
--- /dev/null
+++ b/bryce/mv-smart
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+progname=$(basename $0)
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} <file> [file [...]] <dest>
+
+Options:
+    -h, --help	This help listing
+EOF
+}
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    usage
+    exit 0
+elif [[ $# -lt 2 ]]; then
+    usage
+    exit 1
+fi
+
+
+DEST=${@: -1}
+FILES=${@:1:$(($#-1))}
+
+for file_path in ${FILES} ; do
+    file=$(basename $file_path)
+    dest_file=${DEST}/${file}
+    if [ ! -e ${dest_file} ]; then
+	echo ${file}
+	mv -i ${file_path} ${dest_file}
+	continue
+    fi
+    
+    if [ -d "${file_path}" ]; then
+	echo "directory ${file_path} already exists"
+	continue
+    fi
+
+    a=$(md5sum $file_path | cut -d' ' -f1)
+    b=$(md5sum $dest_file | cut -d' ' -f1)
+
+    if [ "$a" = "$b" ]; then
+	# files are the same; keep destination copy
+	#echo "$file is already in $DEST - $a = $b" 
+	rm $file_path
+    else
+	echo "$dest_file exists and differs from $file.  Skipping."
+    fi
+done
+
+# for dir in *; do diff --brief --recursive --no-dereference --new-file --no-ignore-file-name-case ~/src/$dir $dir > /dev/null 2>&1; if [ $? == 0 ]; then echo $dir; fi; done
diff --git a/bryce/pkg-clean b/bryce/pkg-clean
 new file mode 100755
index 0000000..81a487f
--- /dev/null
+++ b/bryce/pkg-clean
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# This script removes uncommitted changes from a checked out git repository.
+
+INTERACTIVE=${INTERACTIVE:-"no"}
+
+# TODO: Check for any changes in debian/patches/*
+# Check for changes to debian/control or debian/changelog
+deb_changes=$(git diff --name-only debian/changelog debian/control*)
+if [ -n "${deb_changes}" ]; then
+    if [ "${INTERACTIVE}" = "yes" ]; then
+        while true; do
+            read -p "Discard uncommitted changes? (Y/n)" answer
+            case "${answer}" in
+                [Yy]* )
+                    echo "Discarding changes to ${deb_changes}" ;;
+                [Nn]* )
+                    exit 1 ;;
+                * )
+                    echo "Please answer yes or no." \\
+            esac
+        done
+    else
+        # TODO: Allow --force
+        echo "Uncommitted changes exist"
+        echo "${deb_changes}"
+        exit 1
+    fi
+fi
+
+git checkout .
+git clean -fxd
+
+# TODO: maybe use -e to exclude stuff?
+
+# TODO: Maybe git restore or git reset?
diff --git a/bryce/pkg-component b/bryce/pkg-component
 new file mode 100755
index 0000000..9cf91f5
--- /dev/null
+++ b/bryce/pkg-component
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Given a package name, print what component it's in
+show_binary() {
+    local binary_package="${1}"
+
+    echo -n "${binary_package}: "
+    section=$(apt-cache show "${binary_package}" \
+                  | grep Section: \
+                  | cut -d: -f2)
+    if [[ "${section}" =~ "/" ]]; then
+        echo "${section}" \
+            | cut -d/ -f1 \
+            | sort -u \
+            | xargs echo
+    else
+        echo "main"
+    fi
+}
+
+for pkg in "${@}"; do
+    if apt-cache show "${pkg}" 2>&1 | grep Package: > /dev/null; then
+        show_binary "${pkg}"
+        continue
+    fi
+
+    pkg_details=$(apt-cache showsrc "${pkg}")
+    if [ -z "${pkg_details}" ]; then
+	echo " - Could not find a component for ${pkg}"
+	exit 1
+    fi
+
+    binaries=$(echo "${pkg_details}" | grep Binary: | cut -d: -f2 | sed -e "s/,//g")
+    for binary_package in ${binaries}; do
+        show_binary "${binary_package}"
+    done
+done
diff --git a/bryce/pkg-depends b/bryce/pkg-depends
 new file mode 100755
index 0000000..4bf4cd1
--- /dev/null
+++ b/bryce/pkg-depends
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Looks up the install-time dependencies for the given package
+
+list_package_depends() {
+    binary_package="${1}"
+    apt-cache depends "${binary_package}" \
+              --recurse --no-recommends --no-suggests --no-conflicts \
+              --no-breaks --no-replaces --no-enhances \
+        | grep "^\w" \
+        | sort -u
+}
+
+if [ $# -ge 1 ]; then
+    input="printf %s\n ${@}"
+else
+    input="cat -"
+fi
+
+# TODO: read -r disables backslashes
+#       See https://unix.stackexchange.com/questions/192786/what-is-the-meaning-of-read-r
+while read requested_package; do
+    echo "${requested_package}"
+
+    # Find all dependencies recursively
+    for depend in $(list_package_depends "${requested_package}"); do
+        # Don't repeat our own package
+        if [ "${depend}" = "${requested_package}" ]; then
+            continue
+        fi
+
+        # Skip things in main
+        component=$(pkg-component "${depend}")
+        if [ "${component}" = "main" ]; then
+            continue
+        fi
+        echo "  ${depend}"
+    done
+done < <(${input})
diff --git a/bryce/pkg-nochange b/bryce/pkg-nochange
 new file mode 100755
index 0000000..61d98fe
--- /dev/null
+++ b/bryce/pkg-nochange
@@ -0,0 +1,177 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# Easy tool for quickly creating no-change rebuild packages
+
+# No-change rebuilds are necessary when one of the package's
+# dependencies has been updated to a new ABI level.
+
+progname=$(basename "${0}")
+
+rationale="${RATIONALE:-No change rebuild}"
+codename="${CODENAME:-$(distro-info --devel)}"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [package-name] [changelog rationale]
+
+Options:
+  -h, --help  This help text.
+EOF
+    exit "${1}"
+}
+
+## Prints given message to stderr if DEBUG is enabled
+##
+## @param str 1: String to be displayed.
+dbg() {
+    [ -n "${DEBUG}" ] && echo "${@}" 1>&2
+}
+
+## Prints to stderr
+##
+## @param str 1: String to be displayed.
+info() {
+    echo "${@}" 1>&2
+}
+
+## Prints to stderr, prefixed by 'Warning:'
+##
+## @param str 1: String to be displayed.
+warn() {
+    echo "Warning:  ${@}" 1>&2
+}
+
+## Prints to stderr, prefixed by 'Error:'
+##
+## @param str 1: String to be displayed.
+error() {
+    echo "Error:  ${@}" 1>&2
+}
+
+## Prints to stderr, prefixed by 'Fatal:', and terminates with non-zero exit code
+##
+## @param str 1: String to be displayed.
+## @param str 2: Exit error code.
+die() {
+    echo "Fatal:  ${@}" 1>&2
+    exit ${2:-1}
+}
+
+## Strip leading and trailing whitespace
+trim() {
+    local trimmed
+
+    trimmed="${@}"
+    if [ -z "${trimmed}" ]; then
+        read trimmed
+    fi
+
+    # Strip leading spaces.
+    while [[ ${trimmed} == ' '* ]]; do
+       trimmed="${trimmed## }"
+    done
+
+    # Strip trailing spaces.
+    while [[ ${trimmed} == *' ' ]]; do
+        trimmed="${trimmed%% }"
+    done
+
+    echo "${trimmed}"
+}
+
+get_pkgsys() {
+    if [ -d ".git" ]; then
+        if git remote -v | grep -P "^pkg\t"; then
+            echo "git-ubuntu"
+            return 0
+        fi
+    fi
+    echo "apt"
+    return 0
+}
+
+get_version_from_changelog() {
+    dpkg-parsechangelog | grep ^Version | cut -d: -f2 | trim
+}
+
+get_upstream_version_from_changelog() {
+    get_version_from_changelog "${@}" | cut -d- -f1 | trim
+}
+
+install_build_dependencies() {
+    local package_name="${1}"
+
+    # Install build dependencies for package
+    if which install-build-deps; then
+        install-build-deps || return 1
+    elif [ -n "${package_name}" ]; then
+        sudo apt-get -y build-dep "${package_name}" || return 1
+    else
+        return 1
+    fi
+
+    return 0
+}
+
+rev_package_for_nochange() {
+    local codename="${1}"
+    local rationale="${2}"
+
+    echo "version: $(get_version_from_changelog)"
+    if [[ "$(get_version_from_changelog)" == *"ubuntu"* ]]; then
+        # If current version has ubuntuN, then just increment it.
+        dch -i --distribution "${codename}" "${rationale}"
+    else
+        # append build1
+        dch -l "build" --distribution "${codename}" "${rationale}"
+    fi
+}
+
+main() {
+    # Determine package name
+    if [ -d './debian' ]; then
+        # We're already in a source package tree, so use it preferentially
+        package_name=$(dpkg-parsechangelog | grep ^Source: | cut -d' ' -f2)
+    elif [ -n "${1}" ] || [ -n "${PACKAGE}" ]; then
+        # Package was specified on commandline
+        package_name="${1:-${PACKAGE}}"
+        package_dir=$(pkg-get "${package_name}") || {
+            warn "Could not get package source"
+            exit 1
+        }
+        cd "${package_dir}" || {
+            warn "Could not chdir '${package_dir}'"
+            exit 1
+        }
+    else
+        usage 1
+    fi
+
+    install_build_dependencies "${package_name}" || {
+        warn "Could not install build dependencies"
+    }
+
+    rev_package_for_nochange "${codename}" "${rationale}" || {
+        warn "Could not rev package version"
+    }
+
+    if [ "$(get_pkgsys)" = "git-ubuntu" ]; then
+        warn "tbd"
+        # TODO: If git-ubuntu, use push-for-upload
+        debuild -S
+    else
+        debuild -S
+    fi
+
+    # TODO: Look at pitt job for code to detect the right source.changes
+
+    ls -l ../*source.changes
+
+    info "Ready to upload:"
+    info "  \$ dput ubuntu ../<whatever>source.changes"
+}
+
+if [[ "${0}" == "${BASH_SOURCE[0]}" ]]; then
+    main "${@}"
+fi
diff --git a/bryce/pkg-rdepends b/bryce/pkg-rdepends
 new file mode 100755
index 0000000..25ba63f
--- /dev/null
+++ b/bryce/pkg-rdepends
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# See also cpaelzer's versioned-rdepends.sh
+
+# TODO: --recurse?
+# TODO: --recommends?
+apt-cache --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances rdepends "${@}"
+
+# TODO: This should list whether the rdep is a Recommends or Depends
diff --git a/bryce/pkg-source b/bryce/pkg-source
 new file mode 100755
index 0000000..2385e22
--- /dev/null
+++ b/bryce/pkg-source
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+for pkg in "${@}"; do
+    if ! pkg_details=$(apt-cache show "${pkg}"); then
+	if ! pkg_details=$(apt-cache showsrc "${pkg}"); then
+	    echo " - Can't find ${pkg} in archive"
+	    continue
+	fi
+    fi
+
+    if [ $? -ne 0 ]; then
+	echo " - Could not find source for ${pkg}"
+	exit 1
+    fi
+    source_package=$(echo "${pkg_details}" \
+			 | grep Source: \
+			 | cut -d: -f2 \
+			 | sort -u \
+			 | xargs echo)
+    if [ -z "${source_package}" ]; then
+	echo "Couldn't find source for ${pkg}"
+	echo "${pkg_details}"
+    else
+	echo "${source_package}"
+    fi
+
+done
diff --git a/bryce/prepend b/bryce/prepend
 new file mode 100755
index 0000000..abdc1e1
--- /dev/null
+++ b/bryce/prepend
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+progname=$(basename $0)
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} <insert-file> <target-file>
+EOF
+}
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    usage
+    exit 0
+elif [[ $# -lt 2 ]]; then
+    usage
+    exit 1
+fi
+
+insert_file=$1
+target_file=$2
+dummy=/tmp/${target_file}.dummy
+
+cat $target_file > $dummy
+mv ${target_file} ${target_file}.old
+cat $insert_file $dummy > $target_file
+
diff --git a/bryce/rmad b/bryce/rmad
 new file mode 100755
index 0000000..d689b18
--- /dev/null
+++ b/bryce/rmad
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+package_name="${1}"
+
+if [ -z "${package_name}" ]; then
+    # TODO: Is the directory we're in a valid package name?
+    echo "Usage: rmad <package-name>"
+    exit 1
+fi
+stable=$(distro-info --stable)
+codename=$(distro-info --devel 2>/dev/null)
+rmadison -s "${stable},${stable}-security,${stable}-updates,${codename},${codename}-proposed" -a "source" "${package_name}" | sed -e "s/ | source//"
+echo
+rmadison -u "debian" -a "source" "${package_name}" | grep -v oldstable | grep -v "\-(backports|debug)" | sed -e "s/ | source//"
+
+# Filter out *stable* and *testing*
diff --git a/bryce/shuffle b/bryce/shuffle
 new file mode 100755
index 0000000..6ad1453
--- /dev/null
+++ b/bryce/shuffle
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import sys
+import random
+
+filename = sys.argv[1]
+a = open(filename).read().strip().split("\n")
+
+random.shuffle(a)
+for i in a:
+    print(i)
diff --git a/check-before-lib-update.sh b/check-before-lib-update.sh
 deleted file mode 100755
index 971496c..0000000
--- a/check-before-lib-update.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-set -ue
-
-if [ $# -ne 2 ];then
-    echo "invalid number of arguments"
-    exit 1
-fi
-REL=${1}
-PKG=${2}
-
-TDIR=$(mktemp -d)
-
-getchdist () {
-    local name=${1}
-    chdist --data-dir=${TDIR} create ${REL}-${name} 1>/dev/null
-    cat << EOF > ${TDIR}/${REL}-${name}/etc/apt/sources.list
-deb http://de.archive.ubuntu.com/ubuntu/ ${REL} main restricted universe multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ ${REL} main restricted universe multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ ${REL}-updates main restricted universe multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ ${REL}-updates main restricted universe multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ ${REL}-backports main restricted universe multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ ${REL}-backports main restricted universe multiverse
-
-deb http://de.archive.ubuntu.com/ubuntu/ ${REL}-proposed main restricted universe multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ ${REL}-proposed main restricted universe multiverse
-
-deb-src http://archive.canonical.com/ubuntu ${REL} partner
-
-deb http://security.ubuntu.com/ubuntu ${REL}-security main restricted
-deb-src http://security.ubuntu.com/ubuntu ${REL}-security main restricted
-deb http://security.ubuntu.com/ubuntu ${REL}-security universe
-deb-src http://security.ubuntu.com/ubuntu ${REL}-security universe
-deb http://security.ubuntu.com/ubuntu ${REL}-security multiverse
-deb-src http://security.ubuntu.com/ubuntu ${REL}-security multiverse
-EOF
-}
-
-getchdist "proposed-only"
-sed -i -e '/proposed/!d' ${TDIR}/${REL}-proposed-only/etc/apt/sources.list
-getchdist "proposed"
-
-chdist --data-dir=${TDIR} apt ${REL}-proposed-only update 1>/dev/null
-chdist --data-dir=${TDIR} apt ${REL}-proposed update 1>/dev/null
-
-chdist --data-dir=${TDIR} apt-cache ${REL}-proposed rdepends ${PKG}  > ${TDIR}/rdepends
-cat ${TDIR}/rdepends |xargs -n1 chdist --data-dir=${TDIR} bin2src ${REL}-proposed | sort | uniq > ${TDIR}/rdepends-src
-cat ${TDIR}/rdepends-src |xargs -n1 chdist --data-dir=${TDIR} apt-cache ${REL}-proposed-only showsrc 2>/dev/null | grep-dctrl -nsPackage . > ${TDIR}/overlap
-
-ls -ltr ${TDIR}
-
-printf "\n\nYou might need to rebuild (*currently in proposed)\n"
-while read -r line; do
-    if grep -q -e "^$line$" ${TDIR}/overlap; then
-        printf "* "
-    fi
-    echo "$line"
-done < ${TDIR}/rdepends-src
diff --git a/cpaelzer/TrelloToJira.py b/cpaelzer/TrelloToJira.py
 new file mode 100755
index 0000000..9267d9b
--- /dev/null
+++ b/cpaelzer/TrelloToJira.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+"""
+Convert trello (CSV) Data to Jira entries
+
+One might wonder that there is no better way, but even the pro products
+that exist seem more complex. If you just want to migrate a bunch of cards
+this appeared to be the most simple way and worked quite well.
+
+It should be a good start to derive other solutions from, if needed.
+"""
+
+import argparse
+import csv
+from jira import JIRA
+
+def main(filename, token, accountid, tag, user, server):
+    jiracon = JIRA(basic_auth=(user, token), server=server)
+
+    with open(filename, "r", newline='', encoding="utf-8") as csvfile:
+        reader = csv.reader(csvfile, delimiter=',', quotechar='"')
+        for row in reader:
+
+            # Header of the card
+            summary = row[1]
+            # Body of the card
+            description = row[3]
+
+            archived = row[18]
+            if archived == "true":
+                print("Skip Archived '%s'" % summary)
+                continue
+
+            new_tags = []
+            new_tags.append(tag)
+            # add any special tag conditions here to the list - you can process
+            # tags = row[4]
+            # which is the lost of tags from trello
+
+            print("Create %s with tags '%s'" % (summary, new_tags))
+
+            new_issue = jiracon.create_issue(project='SD',
+                                             summary=summary,
+                                             description=description,
+                                             issuetype={'name': 'Story'})
+            for new_tag in new_tags:
+                new_issue.fields.labels.append(new_tag)
+            new_issue.update(fields={"labels": new_issue.fields.labels})
+
+            print("  Done - new ID %s" % (new_issue))
+
+
+if __name__ == '__main__':
+    PARSER = argparse.ArgumentParser()
+    # Trello CSV export is rather readable and static
+    # Worst case one can easily manually edit it (mcuh easier than the json).
+    # json is more complete as it has all the object hierarchy and even history
+    # but that also makes it hard to process for simple use cases.
+    # Get it via "Show Menu" - "more" - "Print and export" - "export as CSV"
+    PARSER.add_argument('filename',
+                        help='CVS File to read data from (exported from Trello)')
+    PARSER.add_argument('--token',
+                        help='Token from https://id.atlassian.com/manage-profile/security/api-tokens')
+    PARSER.add_argument('--accountid',
+                        help='ID of the person to assign items, fetched to from https://warthogs.atlassian.net/rest/api/3/user/search?query=<email>')
+    PARSER.add_argument('--tag',
+                        help='A tag to be able to differentiate these from the many other items in the backlog')
+    PARSER.add_argument('--user',
+                        help='Username (email) to log into Jira')
+    PARSER.add_argument('--server',
+                        help='Jira Server to connect to',
+                        default='https://warthogs.atlassian.net')
+    ARGS = PARSER.parse_args()
+
+    main(ARGS.filename, ARGS.token, ARGS.accountid, ARGS.tag, ARGS.user,
+         ARGS.server)
diff --git a/cpaelzer/autopkgtests-running.sh b/cpaelzer/autopkgtests-running.sh
 new file mode 100755
index 0000000..12877aa
--- /dev/null
+++ b/cpaelzer/autopkgtests-running.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+wget -O - -q http://autopkgtest.ubuntu.com/running \
+    | grep -e '<tr><th>Architecture:</th><td>.*</td></tr>' - \
+    | sed 's/<tr><th>Architecture:<\/th><td>//' \
+    | sed 's/<\/td><\/tr>//' \
+    | sort | uniq  -c | sort -rn
diff --git a/cpaelzer/build-for-ppa.sh b/cpaelzer/build-for-ppa.sh
 new file mode 100755
index 0000000..fb7f15e
--- /dev/null
+++ b/cpaelzer/build-for-ppa.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# linked as `bp` in ~/bin/ for quick access
+set -uxe
+
+cver=$(dpkg-parsechangelog --show-field Version)
+crel=$(dpkg-parsechangelog --show-field Distribution)
+clbckp=$(mktemp)
+cp debian/changelog "${clbckp}"
+
+if [[ "${cver}" =~ "ppa" ]]; then
+    # already has a ppa string, only increment
+    dch -i --preserve "PPA build"
+else
+    # find non existing ppa suffix
+    for i in {1..100}; do
+        newver="${cver}~${crel}ppa${i}"
+        nonepoch=$(echo "${newver}" | sed 's/[0-9]://')
+        if ! ls ../*${nonepoch}* 1>/dev/null 2>&1; then
+            break
+        fi
+    done
+    sed -i -e "1 s/ (.*) / (${newver}) /" debian/changelog
+fi
+
+# build source
+dpkg-buildpackage -S -nc -d -sa
+
+# Restore/Clean
+cp "${clbckp}" debian/changelog
+rm -f debian/files
diff --git a/buildpkg-qemu.sh b/cpaelzer/buildpkg-qemu.sh
 similarity index 96%
 rename from buildpkg-qemu.sh
 rename to cpaelzer/buildpkg-qemu.sh
index c9f3d10..9c6772f 100755
--- a/buildpkg-qemu.sh
+++ b/cpaelzer/buildpkg-qemu.sh
@@ -37,5 +37,9 @@ rm -f debian/control
 ./debian/rules debian/control
 chmod +w debian/control
 
+# Old qemu had empty dirs, but that will end up in the tarball and
+# complain about mismatches
+find -name ..git -exec rm -f {} \;
+
 # Build pkg and add any extra arguments
 dpkg-buildpackage -S -nc -d $@
diff --git a/check-OS-packages-on-server-mapping.sh b/cpaelzer/check-OS-packages-on-server-mapping.sh
 similarity index 100%
 rename from check-OS-packages-on-server-mapping.sh
 rename to cpaelzer/check-OS-packages-on-server-mapping.sh
diff --git a/check-autopkgtest-stats.sh b/cpaelzer/check-autopkgtest-stats.sh
 similarity index 72%
 rename from check-autopkgtest-stats.sh
 rename to cpaelzer/check-autopkgtest-stats.sh
index be40820..d0ae31d 100755
--- a/check-autopkgtest-stats.sh
+++ b/cpaelzer/check-autopkgtest-stats.sh
@@ -1,17 +1,18 @@
 #!/bin/bash
 RELEASES="$(distro-info --supported | xargs)"
-ARCHES="amd64 i386 ppc64el s390x armhf"
+ARCHES="amd64 i386 ppc64el s390x armhf arm64"
 PACKAGE="systemd"
 PATTERN=""
 COUNT=20
 VERBOSE=0
+NOCLEAN=0
 WDIR=""
 PATTERNLOG="custom-pattern.log"
 
-while getopts "hp:P:a:r:c:v" opt; do
+while getopts "hp:P:a:r:c:vC" opt; do
     case "$opt" in
         h|\?)
-            echo "$0 [-p <src:package>] [-r 'list of releases'] [-a 'list of architectures'] [-v] [-P 'pattern' to be summed up] [-c <count> to check (default 20)]"
+            echo "$0 [-p <src:package>] [-r 'list of releases'] [-a 'list of architectures'] [-v] [-C] [-P 'pattern' to be summed up] [-c <count> to check (default 20)]"
             exit 0
             ;;
         p)  PACKAGE=$OPTARG
@@ -24,6 +25,8 @@ while getopts "hp:P:a:r:c:v" opt; do
             ;;
         c)  COUNT=$OPTARG
             ;;
+        C)  NOCLEAN=1
+            ;;
         v)  VERBOSE=1
             ;;
         esac
@@ -32,7 +35,7 @@ done
 echo "Check last ${COUNT} test results for src:${PACKAGE} on releases '${RELEASES}' on architectures '${ARCHES}'"
 
 cleanup() {
-    if [[ -n "${WDIR}" && -d "${WDIR}" && ${WDIR} == /tmp/* ]]; then
+    if [[ ${NOCLEAN} -ne 1 && -n "${WDIR}" && -d "${WDIR}" && ${WDIR} == /tmp/* ]]; then
         rm -Rf "${WDIR}"
     fi
 }
@@ -47,22 +50,37 @@ WDIR=$(mktemp -d) || { echo "failed to make tempdir"; exit 1; }
 trap cleanup EXIT
 cd ${WDIR}
 
-echo "Fetch Data to ${WDIR}"
+if [ ${VERBOSE} -eq 1 ]; then
+    echo "Fetch Data to ${WDIR}"
+fi
+
 for arch in ${ARCHES}; do
     debug "A: ${arch}"
     for release in ${RELEASES}; do
         debug " R: ${arch}-${release}"
         wget --quiet "http://autopkgtest.ubuntu.com/packages/${PACKAGE:0:1}/${PACKAGE}/${release}/${arch}" -O "${release}-${arch}.history"
+        debug " U: http://autopkgtest.ubuntu.com/packages/${PACKAGE:0:1}/${PACKAGE}/${release}/${arch}"
         logs=$(awk -F  '"' '/>log<\/a>/ {print $2}' "${release}-${arch}.history" | head -n "${COUNT}")
         i=0
         for log in ${logs}; do
-            debug "  L:  ${release}-${arch}.$((++i))"
+            debug "  L:  ${release}-${arch}.$((++i)) => ${log}"
             wget --quiet "${log}" -O "${release}-${arch}.${i}" &
         done
     done
 done
 wait
 
+badtest() {
+    for testname in "${!FAILLOG[@]}"; do
+        FAILLOG["${testname}"]="${FAILLOG["${testname}"]}B"
+    done
+}
+
+timeouttest() {
+    for testname in "${!FAILLOG[@]}"; do
+        FAILLOG["${testname}"]="${FAILLOG["${testname}"]}T"
+    done
+}
 tracefaillog() {
     tlist="${1}"
     symbol="${2}"
@@ -81,10 +99,14 @@ for release in ${RELEASES}; do
         failures=""
         unset FAILLOG
         declare -A FAILLOG
-        for log in $(ls ${release}-${arch}.[0-9]*); do
-            newfail="$(zcat "${log}" | sed -n -e '/^autopkgtest.*summary/,$p' | awk '/FAIL/ {print $1}')"
-            newpass="$(zcat "${log}" | sed -n -e '/^autopkgtest.*summary/,$p' | awk '/PASS/ {print $1}')"
-            newskip="$(zcat "${log}" | sed -n -e '/^autopkgtest.*summary/,$p' | awk '/SKIP/ {print $1}')"
+        for log in $(ls -v ${release}-${arch}.[0-9]*); do
+            # some aborts have what seems like results in between (recursive runs), ignore all but the last 100 lines
+            # furthermore some results get reported twice
+            zcat "${log}" | tail -n 150 | sed -ne '/^autopkgtest.*@@.*summary$/,$ p' | sort | uniq > "${log}.results"
+            newfail="$(awk '/\sFAIL\s/ {print $1}'  ${log}.results)"
+            newpass="$(awk '/\sPASS$/ {print $1}'   ${log}.results)"
+            newskip="$(awk '/\sSKIP\s/ {print $1}'  ${log}.results)"
+            newflak="$(awk '/\sFLAKY\s/ {print $1}' ${log}.results)"
             if [ -n "${PATTERN}" ]; then
                 zcat "${log}" | grep -e "${PATTERN}" >> "${PATTERNLOG}"
             fi
@@ -94,14 +116,32 @@ for release in ${RELEASES}; do
             tracefaillog "${newfail}" "F"
             tracefaillog "${newpass}" "."
             tracefaillog "${newskip}" "S"
+            tracefaillog "${newflak}" "f"
+            if [[ -z "${newfail}${newpass}${newskip}${newflak}" ]]; then
+                if zcat "${log}" | grep -q '<VirtSubproc>: failure: Timed out on waiting for ssh connection'; then
+                    timeouttest
+                else
+                    badtest
+                fi
+            fi
         done
         printf "  ${arch}\n"
         if [ -n "${failures}" ]; then
-            countedfails=$(echo "${failures}" | sed -r '/^\s*$/d' | sort | uniq -c | awk --assign count=${COUNT} '{ percent=($1/count)*100; printf("%-40s (%6.2lf%%)\n", $0, percent)}')
-            while read -r line; do
-                testname=$(echo ${line} | awk '{print $2}' | tr -d .)
-                printf "%50s %s\n" "${line}" ${FAILLOG["${testname}"]}
-            done <<< "${countedfails}"
+            for testname in "${!FAILLOG[@]}"; do
+                countfail=$(echo ${FAILLOG["${testname}"]} | tr -cd 'F' | wc -c)
+                countskip=$(echo ${FAILLOG["${testname}"]} | tr -cd 'S' | wc -c)
+                countpass=$(echo ${FAILLOG["${testname}"]} | tr -cd '.' | wc -c)
+                countflak=$(echo ${FAILLOG["${testname}"]} | tr -cd 'f' | wc -c)
+                countbad=$(echo ${FAILLOG["${testname}"]} | tr -cd 'B' | wc -c)
+                if [ $COUNT -ne $((countpass+countbad)) ]; then
+                    printf "    %-30s (F %2u%% f %2u%% S %2u%% B %2u%% => P %2u%%/) %s\n" \
+                        "${testname}" \
+                        "$((countfail*100/COUNT))" "$((countflak*100/COUNT))" \
+                        "$((countskip*100/COUNT))" \
+                        "$((countbad*100/COUNT))" "$((countpass*100/COUNT))" \
+                        ${FAILLOG["${testname}"]}
+                fi
+            done
         else
             echo "    no failures"
         fi
diff --git a/check-component-mismatches-v2.sh b/cpaelzer/check-component-mismatches-v2.sh
 similarity index 100%
 rename from check-component-mismatches-v2.sh
 rename to cpaelzer/check-component-mismatches-v2.sh
diff --git a/check-component-mismatches.sh b/cpaelzer/check-component-mismatches.sh
 similarity index 100%
 rename from check-component-mismatches.sh
 rename to cpaelzer/check-component-mismatches.sh
diff --git a/dput b/cpaelzer/dput
 similarity index 84%
 rename from dput
 rename to cpaelzer/dput
index 54aedcf..4523488 100755
--- a/dput
+++ b/cpaelzer/dput
@@ -5,6 +5,16 @@ CMD="/usr/bin/dput"
 # Checker for silly mistakes (I seem to have others than other people)
 # So I need to check mine on my own
 
+if [ "$#" -ne 2 ]; then
+    echo "Usage with two args: ubuntu/ftp-master .changes-file, got $@"
+    exit 1
+fi
+
+if grep "LP:.*9999" $2; then
+    echo "Likely left a placeholder in the changelog"
+    err=1
+fi
+
 if [ -z "$2" ]; then
     echo "Only one Arg is unsafe (and would break later)"
     err=1
diff --git a/cpaelzer/excuses-top-blocker.sh b/cpaelzer/excuses-top-blocker.sh
 new file mode 100755
index 0000000..5941819
--- /dev/null
+++ b/cpaelzer/excuses-top-blocker.sh
@@ -0,0 +1,4 @@
+f=$(mktemp)
+wget https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html -O $f
+awk '/not considered/ {gsub(".*a href=\"#",""); gsub("\">.*",""); print $0}' $f  | sort | uniq -c | sort -n
+rm $f
diff --git a/get-packages-subscribed.py b/cpaelzer/get-packages-subscribed.py
 similarity index 98%
 rename from get-packages-subscribed.py
 rename to cpaelzer/get-packages-subscribed.py
index ae14b7f..9ac37bc 100755
--- a/get-packages-subscribed.py
+++ b/cpaelzer/get-packages-subscribed.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 Derived from ubuntu-archive-tools package-subscribers to detemine
 the list of subscribers for a Team
diff --git a/git-to-dquilt.sh b/cpaelzer/git-to-dquilt.sh
 similarity index 62%
 rename from git-to-dquilt.sh
 rename to cpaelzer/git-to-dquilt.sh
index 0296191..3855bb3 100755
--- a/git-to-dquilt.sh
+++ b/cpaelzer/git-to-dquilt.sh
@@ -5,6 +5,12 @@ set -uxe
 # git-to-dquilt.sh <bugnumber>|none git-base-url commit[, ...]
 # will apply commits in order and convert to d/p/ entries with dep3 headers
 
+if [ -e "${HOME}/.quiltrc-dpkg" ]; then
+    QUILTRC="${HOME}/.quiltrc-dpkg"
+else
+    QUILTRC="${HOME}/.quiltrc"
+fi
+
 insert_patch_template() {
     local patch=${1}
     local commiturl=${2}
@@ -15,7 +21,11 @@ insert_patch_template() {
         then
              echo ""
              echo "Origin: upstream, ${commiturl}"
-             if [[ ${BUG} != "none" ]]; then
+             if [[ ${BUG} == SF* ]]; then
+                 echo "Bug-SF: ${BUG}"
+             elif [[ ${BUG} == CVE* ]]; then
+                 echo "CVE: https://ubuntu.com/security/${BUG}"
+             elif [[ ${BUG} != "none" ]]; then
                  echo "Bug-Ubuntu: https://bugs.launchpad.net/bugs/${BUG}"
              fi
              echo "Last-Update: $(date +%F)"
@@ -48,17 +58,28 @@ get_commit_id() {
 }
 
 apply_commit() {
-    commit=${1}
+    local commit=${1}
+    local suffix=""
+    local patch=""
+    local prefix="${PREFIX}"
 
     patch=$(git format-patch -1 "${commit}")
-    if [ $(pwd) == *libvirt* || $(pwd) == *qemu* ]; then
-        prefix="ubuntu"
-    else
-        prefix=""
+    # auto prefix detection for some projects if not set externally
+    if [ -z "${PREFIX}" ]; then
+        if [[ $(pwd) == *libvirt* || $(pwd) == *qemu* ]]; then
+            prefix="ubuntu/"
+        else
+            prefix=""
+        fi
     fi
+    [[ -n "${prefix}" && "${prefix}" != */ ]] && prefix="${prefix}/"
 
     if [[ ${BUG} == "none" ]]; then
         patch=$(rename -v "s/000[0-9]-//" "${patch}" | awk '{print $NF}')
+    elif [[ ${BUG} == SF* ]]; then
+        patch=$(rename -v "s/000[0-9]/sf-${BUG}/" "${patch}" | awk '{print $NF}')
+    elif [[ ${BUG} == CVE* ]]; then
+        patch=$(rename -v "s/000[0-9]/${BUG}/" "${patch}" | awk '{print $NF}')
     else
         patch=$(rename -v "s/000[0-9]/lp-${BUG}/" "${patch}" | awk '{print $NF}')
     fi
@@ -66,14 +87,52 @@ apply_commit() {
 
     insert_patch_template "${patch}" "${URL}${commit}"
 
-    quilt --quiltrc=/home/paelzer/.quiltrc-dpkg import "${patch}" -P "${prefix}${patch}"
-    quilt --quiltrc=/home/paelzer/.quiltrc-dpkg push --fuzz=0
+    if [ -e "debian/patches/${prefix}${patch}" ]; then
+        suffix="1"
+        while [ -e "debian/patches/${prefix}${patch}-${suffix}" ]; do
+            suffix=$((suffix + 1))
+        done
+        suffix="-${suffix}"
+    fi
+
+    quilt --quiltrc="${QUILTRC}" import "${patch}" -P "${prefix}${patch}${suffix}"
+    quilt --quiltrc="${QUILTRC}" push --fuzz=0
     rm "${patch}"
 }
 
 if [ $# -lt 3 ]; then
-    echo "usage $0  <bugnumber>|none  git-base-url  commit[, ...]"
-    echo "remember ; in URls will end the command string"
+    echo "usage $0  [-b <bugnumber>]  -u git-base-url [-p prefix]  commit[, ...]"
+    echo "-b bug number for dep-3 headers"
+    echo "-p prefix for the patch name"
+    echo "-u URL to reach the commit"
+    echo "remember ; in URls will often include an &, best use '' around it"
+    exit 1
+fi
+
+BUG="none"
+URL=""
+PREFIX=""
+
+while getopts ":b:u:p:" opt; do
+  case ${opt} in
+    b )
+      BUG=${OPTARG}
+      ;;
+    u )
+      URL=${OPTARG}
+      ;;
+    p )
+      PREFIX=${OPTARG}
+      ;;
+    \? ) echo "Usage: $0 [-b <bugno>] -u <base-git-URL> [-p <prefix>] git-hash..."
+      ;;
+  esac
+done
+shift $((OPTIND-1))
+
+
+if [ -z "${URL}" ]; then
+    echo "You must set an URL"
     exit 1
 fi
 
@@ -85,16 +144,13 @@ fi
 
 # might be the first, can't push in that case
 if [ -s debian/patches/series ]; then
-    quilt --quiltrc=/home/paelzer/.quiltrc-dpkg push -a --fuzz=0
+    quilt --quiltrc="${QUILTRC}" push -a --fuzz=0
 fi
 
-BUG=${1:-none}
-URL=${2:-""}
-
-for commitid in "${@:3}"; do
+for commitid in "${@}"; do
     apply_commit "${commitid}"
 done
 
-quilt --quiltrc=/home/paelzer/.quiltrc-dpkg pop -a
-
+# report final status
+quilt --quiltrc="${QUILTRC}" pop -a
 git status
diff --git a/locallibvirt.sh b/cpaelzer/locallibvirt.sh
 similarity index 100%
 rename from locallibvirt.sh
 rename to cpaelzer/locallibvirt.sh
diff --git a/localrepo.sh b/cpaelzer/localrepo.sh
 similarity index 100%
 rename from localrepo.sh
 rename to cpaelzer/localrepo.sh
diff --git a/lp-affects-devel b/cpaelzer/lp-affects-devel
 similarity index 100%
 rename from lp-affects-devel
 rename to cpaelzer/lp-affects-devel
diff --git a/cpaelzer/lp-test-isrunning b/cpaelzer/lp-test-isrunning
 new file mode 100755
index 0000000..fc36d6c
--- /dev/null
+++ b/cpaelzer/lp-test-isrunning
@@ -0,0 +1,61 @@
+#!/usr/bin/python3
+# Credit goes to APW who shared this with me - thanks!
+
+import datetime
+import os
+import sys
+
+import urllib.request
+import json
+
+#urllib.request.urlcleanup()
+request = urllib.request.Request('http://autopkgtest.ubuntu.com/static/running.json')
+request.add_header('Cache-Control', 'max-age=0')
+with urllib.request.urlopen(request) as response:
+    data = response.read()
+    jobs = json.loads(data.decode('utf-8'))
+
+
+running = []
+for pkg in jobs:
+    for handle in jobs[pkg]:
+        for series in jobs[pkg][handle]:
+            for arch in jobs[pkg][handle][series]:
+                jobinfo = jobs[pkg][handle][series][arch]
+                triggers = ','.join(jobinfo[0].get('triggers', '-'))
+                ppas = ','.join(jobinfo[0].get('ppas', '-'))
+                time = jobinfo[1]
+                env = jobinfo[0].get('env', '-')
+                time = str(datetime.timedelta(seconds=jobinfo[1]))
+                try:
+                    running.append((jobinfo[1], "R     {6:6} {0:30} {5:10} {1:8} {2:8} {3:31} {4} {7}".format(pkg, series, arch, ppas, triggers, '-', time, env)))
+                except BrokenPipeError:
+                    sys.exit(1)
+
+for (time, row) in sorted(running, reverse=True):
+    print(row)
+
+request = urllib.request.Request('http://autopkgtest.ubuntu.com/queues.json')
+request.add_header('Cache-Control', 'max-age=0')
+with urllib.request.urlopen(request) as response:
+    data = response.read()
+    queues = json.loads(data.decode('utf-8'))
+
+    for origin in queues:
+        for series in queues[origin]:
+            for arch in queues[origin][series]:
+                n = 0
+                for key in queues[origin][series][arch]:
+                    (pkg, json_data) = key.split(maxsplit=1)
+                    jobinfo = json.loads(json_data)
+
+                    triggers = ','.join(jobinfo.get('triggers', '-'))
+                    ppas = ','.join(jobinfo.get('ppas', '-'))
+
+                    n = n + 1
+                    try:
+                        print("Q{5:04d} {7:>6} {0:30} {6:10} {1:8} {2:8} {3:31} {4}".format(pkg, series, arch, ppas, triggers, n, origin, '-:--'))
+                    except BrokenPipeError:
+                        sys.exit(1)
+
+        #                 /Running for:/ { printf("%-30s %-8s %-8s%-31s%s\n", pkg, release, arch, ppas, triggers); next }
diff --git a/cpaelzer/lp-test-ppa b/cpaelzer/lp-test-ppa
 new file mode 100755
index 0000000..b467f2d
--- /dev/null
+++ b/cpaelzer/lp-test-ppa
@@ -0,0 +1,395 @@
+#!/usr/bin/env python3
+# Thanks to APW for the part around getRunning
+
+import argparse
+import datetime
+import gzip
+import json
+import os
+import re
+import urllib.request
+import urllib.parse
+import sys
+import time
+
+from launchpadlib.credentials import UnencryptedFileCredentialStore
+from launchpadlib.launchpad import Launchpad
+
+
+def getRunning():
+    request = urllib.request.Request('http://autopkgtest.ubuntu.com/static/running.json')
+    request.add_header('Cache-Control', 'max-age=0')
+    with urllib.request.urlopen(request) as response:
+        data = response.read()
+        jobs = json.loads(data.decode('utf-8'))
+
+    running = []
+    for pkg in jobs:
+        for handle in jobs[pkg]:
+            for series in jobs[pkg][handle]:
+                for arch in jobs[pkg][handle][series]:
+                    jobinfo = jobs[pkg][handle][series][arch]
+                    triggers = ','.join(jobinfo[0].get('triggers', '-'))
+                    ppas = ','.join(jobinfo[0].get('ppas', '-'))
+                    time = str(datetime.timedelta(seconds=jobinfo[1]))
+                    running.append({"time":    time,
+                                    "pkg":     pkg,
+                                    "release": series,
+                                    "arch":    arch,
+                                    "ppa":     ppas,
+                                    "trigger": triggers})
+
+    return sorted(running, key=lambda k: k['time'])
+
+
+def getWaiting():
+    request = urllib.request.Request('http://autopkgtest.ubuntu.com/queues.json')
+    request.add_header('Cache-Control', 'max-age=0')
+    with urllib.request.urlopen(request) as response:
+        data = response.read()
+        queues = json.loads(data.decode('utf-8'))
+
+        waiting = []
+        for origin in queues:
+            for series in queues[origin]:
+                for arch in queues[origin][series]:
+                    n = 0
+                    for key in queues[origin][series][arch]:
+                        (pkg, json_data) = key.split(maxsplit=1)
+                        jobinfo = json.loads(json_data)
+
+                        triggers = ','.join(jobinfo.get('triggers', '-'))
+                        ppas = ','.join(jobinfo.get('ppas', '-'))
+
+                        n = n + 1
+                        waiting.append({"number":  n,
+                                        "pkg":     pkg,
+                                        "release": series,
+                                        "arch":    arch,
+                                        "ppa":     ppas,
+                                        "trigger": triggers})
+
+        return waiting
+
+
+def getLink(url, text, end='\n'):
+    return f"\u001b]8;;{url}\u001b\\{text}\u001b]8;;\u001b\\"
+
+
+def showTriggers(trigger_name, trigger_version, release,
+                 ppa_user, ppa_name, test_name):
+    urlfmt = ("https://autopkgtest.ubuntu.com/request.cgi?release=%s" +
+              "&arch=%s&package=%s&ppa=%s/%s&trigger=%s/%s")
+    req_url = urlfmt % (release, "%s", test_name,
+                        ppa_user, ppa_name, trigger_name,
+                        "%s")
+    enc_version = urllib.parse.quote_plus(trigger_version)
+
+    # Triggers for all Architectures
+    for arch in ARCHES:
+        # list src@arch header + triggers
+        print("  %20s @ %-7s for %s/%s" % (test_name, arch, trigger_name,
+                                           trigger_version), end='')
+        arch_req_url = req_url % (arch, enc_version)
+        print("     %s" % getLink(arch_req_url, "Trigger @%s ♻️ " % arch),
+              end='')
+        print("     %s" % getLink("%s&all-proposed=1" % arch_req_url,
+                                  "Trigger all proposed @%s ♻️ 💍" % arch))
+
+
+def showActive(release, ppa_user, ppa_name):
+    target = "%s/%s" % (ppa_user, ppa_name)
+    rformat = "    %-8s %-40s %-8s %-8s %-40s %s"
+
+    print("Running:")
+    running = getRunning()
+    running = [e for e in running if e['release'] == release]
+    running = [e for e in running if e['ppa'] == target]
+    if running:
+        print(rformat % ("time", "pkg", "release", "arch", "ppa", "trigger"))
+        for e in running:
+            print(rformat % (e['time'], e['pkg'], e['release'], e['arch'],
+                             e['ppa'], e['trigger']))
+
+    print("Waiting:")
+    waiting = getWaiting()
+    waiting = [e for e in waiting if e['release'] == release]
+    waiting = [e for e in waiting if e['ppa'] == target]
+    if waiting:
+        print(rformat % ("Q-num", "pkg", "release", "arch", "ppa", "trigger"))
+        for e in waiting:
+            print(rformat % (e['number'], e['pkg'], e['release'], e['arch'],
+                             e['ppa'], e['trigger']))
+
+
+def showResults(release, ppa_user, ppa_name, published):
+    resfmt = ("https://autopkgtest.ubuntu.com/results/" +
+              "autopkgtest-%s-%s-%s/?format=plain")
+    result_list = resfmt % (release, ppa_user, ppa_name)
+
+    base_resultfmt = ("https://autopkgtest.ubuntu.com/results/" +
+                      "autopkgtest-%s-%s-%s/")
+    base_result = base_resultfmt % (release, ppa_user, ppa_name)
+
+    print("Results from %s:" % result_list)
+    results_web = []
+    try:
+        with urllib.request.urlopen(result_list) as response:
+            html = response.read()
+            results_web = html.split(b'\n')
+    except urllib.error.HTTPError:
+        print("    No results published yet")
+
+    # gather results
+    result_data = {}
+    for result in results_web:
+        if result == b'' or not result.endswith(b"log.gz"):
+            continue
+        res_url = base_result + result.decode("utf-8")
+        res_elements = res_url.split("/")
+        res_time = time.strptime(res_elements[9][:-7], "%Y%m%d_%H%M%S")
+        res_arch = res_elements[6]
+        res_source = res_elements[8]
+        if (res_source, res_arch) not in result_data:
+            result_data[(res_source, res_arch)] = []
+        result_data[(res_source, res_arch)].append((res_time, res_url))
+
+    # report
+    for source_arch in result_data:
+        # skip non selected architectures
+        if source_arch[1] not in ARCHES:
+            continue
+        # if packagestoshow is set, skip all others
+        if args.packagestoshow:
+            if source_arch[0] not in args.packagestoshow[0]:
+                continue
+
+        # header
+        print("  %s @ %s:" % (source_arch[0], source_arch[1]))
+        if args.showonlylast:
+            result_data[source_arch] = [result_data[source_arch][-1]]
+        for result in result_data[source_arch]:
+            showResult(result, published)
+
+
+def showResultID(result):
+    print("    %10s" % time.strftime("%d.%m.%y %H:%M:%S", result[0]), end='')
+    print("    %s" % getLink(result[1], "Log 🗒️"), end='')
+
+
+def showResult(result, published):
+    with urllib.request.urlopen(result[1]) as result_response:
+        result_gzip = result_response.read()
+        try:
+            result_log = gzip.decompress(result_gzip).decode("utf-8")
+        except UnicodeDecodeError:
+            showResultID(result)
+            print("\n      Broken Test Log ⚪")
+            return
+
+        trigger = []
+        res_trigger = re.search("--env=ADT_TEST_TRIGGERS=.* -- ", result_log)
+        if not res_trigger:
+            report_txt = "    Trigger not listed in log ⚪"
+        else:
+            res_trigger = res_trigger.group(0)
+            res_trigger = res_trigger[len("--env=ADT_TEST_TRIGGERS="):]
+            res_trigger = res_trigger[:res_trigger.find(" -- ")]
+            res_trigger = res_trigger.strip("'")
+            trigger = res_trigger.split()
+            if args.trigger and args.trigger not in trigger:
+                return
+            report_txt = ("    Triggers: %s" % trigger)
+
+        PublishedInTrigger = False
+        if args.selecttrigger == "published":
+            for pubpkg in published:
+                published_trigger = "%s/%s" % (pubpkg['pkg'], pubpkg['vers'])
+                if published_trigger in trigger:
+                    PublishedInTrigger = True
+        elif args.selecttrigger is not None:
+            if args.selecttrigger in trigger:
+                PublishedInTrigger = True
+        else:
+            PublishedInTrigger = True
+        if not PublishedInTrigger:
+            return
+
+        showResultID(result)
+        result_split = result_log.split("@@@@@@@@@@@@@@@@@@@@ summary", 1)
+        if len(result_split) < 2:
+            print("\t⚪ %s\n" % report_txt, end='')
+            print("      %-50s" % ("No valid results"))
+            return
+        result_sum = result_split[1]
+        result_lines = re.findall("(.*PASS|.*SKIP|.*FAIL|.*BAD)", result_sum)
+
+        for line in result_lines:
+            report_result = True
+            overall_status = "✅"
+            status = "⚪"
+            if args.subtest and not line.startswith(args.subtest):
+                report_result = False
+            if line.endswith("SKIP"):
+                status = "🟧"
+                if not args.showskip:
+                    report_result = False
+            if line.endswith("PASS"):
+                status = "✅"
+                if not args.showpass:
+                    report_result = False
+            if line.endswith("FAIL"):
+                status = "🟥"
+                overall_status = "🟥"
+            if report_result:
+                report_txt += ("\n      %-50s %s " % (line, status))
+
+        print("\t%s %s" % (overall_status, report_txt))
+
+
+# Argument parsing
+parser = argparse.ArgumentParser()
+parser.add_argument('ppa',
+                    default=None,
+                    help='name of the ppa to test in ppa:user/name format')
+parser.add_argument('-r', '--release',
+                    default=None,
+                    action='append',
+                    nargs='+',
+                    dest="releases",
+                    help='release(s) to test')
+parser.add_argument('-a', '--arch',
+                    default=None,
+                    action='append',
+                    nargs='+',
+                    dest="arches",
+                    help='Architectures to process (default = all)')
+parser.add_argument('-t', '--testpackage',
+                    default=None,
+                    action='append',
+                    nargs='+',
+                    dest="testpackages",
+                    help='Additional packages to list trigger links for')
+parser.add_argument('-p', '--package',
+                    default=None,
+                    action='append',
+                    nargs='+',
+                    dest="packagestoshow",
+                    help='Only interested in the results of <package>')
+parser.add_argument('-s', '--subtest',
+                    default=None,
+                    dest="subtest",
+                    help='Only report (sub)tests with the given name')
+parser.add_argument('--trigger',
+                    default=None,
+                    dest="trigger",
+                    help='Only report results that contain this trigger')
+parser.add_argument('--showpass',
+                    default=False,
+                    dest="showpass",
+                    action="store_true",
+                    help='Show passing subtests'
+                         ' (overall status is always shown)')
+parser.add_argument('--showskip',
+                    default=False,
+                    dest="showskip",
+                    action="store_true",
+                    help='Show skipped subtests'
+                         ' (overall status is always shown)')
+parser.add_argument('-l', '--last',
+                    default=False,
+                    dest="showonlylast",
+                    action="store_true",
+                    help='Show only the last test result per test')
+parser.add_argument('-f', '--select-trigger',
+                    default=None,
+                    dest="selecttrigger",
+                    help='Show only results which trigger contains this string'
+                         '; Special value "published" only shows if any of the'
+                         ' currently published source/versions are in the'
+                         ' triggers.')
+args = parser.parse_args()
+
+ppa_user = args.ppa.split(":")[1].split("/")[0]
+ppa_name = args.ppa.split(":")[1].split("/")[1]
+
+# log in
+cred_location = os.path.expanduser('~/.lp_creds')
+credential_store = UnencryptedFileCredentialStore(cred_location)
+lp = Launchpad.login_with('affectrelease', 'production', version='devel')
+
+# project/person owning the PPA
+person = lp.people[ppa_user]
+
+if args.arches:
+    ARCHES = args.arches[0]
+else:
+    ARCHES = ["amd64", "s390x", "ppc64el", "arm64", "armhf", "riscv64"]
+
+# get ppa
+ppa = person.getPPAByName(name=ppa_name)
+if ppa is not None:
+    print("Tests for %s" % getLink(ppa.web_link, "PPA %s" % ppa_name))
+    for release in args.releases[0]:
+        print("---- ---- ---- ----")
+        print("Release: %s" % release)
+        series = "https://api.launchpad.net/1.0/ubuntu/%s" % release
+        ppa_sources = ppa.getPublishedSources(distro_series=series)
+        if not ppa_sources:
+            print("Warning: no sources present for %s" % release)
+        else:
+            print("Sources:")
+            for source in ppa_sources:
+                print("  SRC: %s @ %s - %s" % (source.source_package_name,
+                                               source.source_package_version,
+                                               source.status))
+            print("Triggers on published Sources:")
+            published = []
+            for source in ppa_sources:
+                if source.status != "Published":
+                    continue
+
+                showTriggers(source.source_package_name,
+                             source.source_package_version,
+                             release, ppa_user, ppa_name,
+                             source.source_package_name)
+                published.append({"pkg":  source.source_package_name,
+                                  "vers": source.source_package_version})
+
+                if args.testpackages:
+                    for test_name in args.testpackages[0]:
+                        print("Requested tests triggered vs published sources:")
+                        showTriggers(source.source_package_name,
+                                     source.source_package_version, release,
+                                     ppa_user, ppa_name, test_name)
+
+            showResults(release, ppa_user, ppa_name, published)
+            showActive(release, ppa_user, ppa_name)
+else:
+    print("Error: PPA %s not found" % ppa_name)
+    sys.exit(1)
+
+
+# FYI - Bryce has a tool for the earlier steps that does:
+# - open and configure a PPA
+# - upload changes and build
+# - wait for the buidl to be complete
+# it is yet unpublished, but I'll remove my former todo's for this stages
+
+# TODO
+# - get release from PPA (if not set on cmdline)
+# - cmdline: restart-all-failed (and only those)
+# - cmdline: trigger-tests-for-all-not-yet-sucess-tested-sources-in-ppa
+# - if tests results are present, then also show triggers for them (even if we
+#   have no source of it)
+# - do not show header and log is "skipshow" is set and all results are good
+# - split "showResult" into "parseResult" filling an object/struct to then
+#   have much more clear logic control flow on that and eventually print it
+#   in "showResult"
+# - a ppa can have multiple revisions of a package. Usually one is only
+#   interested in the tests of the last one, provide an option to filter
+#   out the others
+# - let all show* functions support filtering per selected Architecture
+# We don't open anything automatically yet, if we want (e.g. retry all failed)
+# import webbrowser
+# webbrowser.open(url[, new=0[, autoraise=True]])
diff --git a/packageset-subscription-mismatches.sh b/cpaelzer/packageset-subscription-mismatches.sh
 similarity index 100%
 rename from packageset-subscription-mismatches.sh
 rename to cpaelzer/packageset-subscription-mismatches.sh
diff --git a/pull-uca-source.py b/cpaelzer/pull-uca-source.py
 similarity index 100%
 rename from pull-uca-source.py
 rename to cpaelzer/pull-uca-source.py
diff --git a/cpaelzer/rma b/cpaelzer/rma
 new file mode 100755
index 0000000..4ccbc3b
--- /dev/null
+++ b/cpaelzer/rma
@@ -0,0 +1,6 @@
+#!/bin/bash
+for p in $@; do
+    rmadison -u debian $p &
+    rmadison $p &
+done
+wait
diff --git a/sbuildchroot b/cpaelzer/sbuildchroot
 similarity index 100%
 rename from sbuildchroot
 rename to cpaelzer/sbuildchroot
diff --git a/testify.sh b/cpaelzer/testify.sh
 similarity index 100%
 rename from testify.sh
 rename to cpaelzer/testify.sh
diff --git a/cpaelzer/update-git-ubuntu-urls.sh b/cpaelzer/update-git-ubuntu-urls.sh
 new file mode 100755
index 0000000..f121417
--- /dev/null
+++ b/cpaelzer/update-git-ubuntu-urls.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+checked=0
+updated=0
+found=0
+for repo in $(find ~/ -name .git -type d 2>/dev/null); do
+    ((checked++))
+    path="$(dirname $repo)"
+    cd "$path"
+    if git remote -v | grep '^pkg\s' | grep -q usd-import-team; then
+        echo "Repo $repo uses the old style, updating"
+        ((found++))
+        pkg1=$(git show pkg/ubuntu/devel:debian/control 2>/dev/null | awk '/^Source:/{print $2}')
+        if [ -z "$pkg1" ]; then
+            # local import
+            pkg1=$(git show importer/ubuntu/devel:debian/control 2>/dev/null | awk '/^Source:/{print $2}')
+        fi
+        pkg2=$(git remote -v | grep '^pkg\s' | grep usd-import-team | awk --field-separator '/' '{gsub(" .*$","",$7); print $7}' | uniq)
+        if [ "$pkg1" != "$pkg2" ]; then
+            echo "Fail: Source $pkg1 and repo $pkg2 mismatch, unsure what to do"
+            continue
+        fi
+        ((updated++))
+        git remote set-url pkg https://git.launchpad.net/ubuntu/+source/$pkg1
+        git remote set-url pkg --push ssh://[e-mail]/ubuntu/+source/$pkg1
+    fi
+done
+echo "Updated $updated of $found repositories (checked: $checked)"
diff --git a/cpaelzer/versioned-rdepends.sh b/cpaelzer/versioned-rdepends.sh
 new file mode 100644
index 0000000..f306c7a
--- /dev/null
+++ b/cpaelzer/versioned-rdepends.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# example only
+# TODO
+# replace perl with variable
+# run it in an traget environment e.g. via LXD
+for p in $(apt-cache rdepends perl | tr -d '|'); do apt-cache show $p | awk -v p="$p" '/^(Depends|Recommends):.* perl \(/ {gsub("^.* perl "," perl "); gsub(", .*",""); gsub("\\| .*",""); printf("%s %s\n",$0,p)}'; done 2>/dev/null | sort -n
diff --git a/hcdist b/hcdist
 deleted file mode 100755
index 015e51a..0000000
--- a/hcdist
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-b=$1
-a=$2
-
-shift 2
-
-exec chdist "$a" "$b" "$@"
diff --git a/packages-per-repo.sh b/packages-per-repo.sh
 deleted file mode 100755
index 1343956..0000000
--- a/packages-per-repo.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-tmp=$(mktemp)
-# or from dpkg --get-selections
-packages=$(dpkg -l | awk '/^ii/ {gsub(":.*",""); print $2}' | xargs)
-apt-cache policy ${packages} | awk '/^[a-zA-Z1-9-]*:/ {gsub(":",""); pkg=$1} /archive/ {printf("%s\t%s\n", $3, pkg)}' | sort | uniq > ${tmp}
-cat ${tmp}
-cut -f 1 ${tmp} | uniq -c
diff --git a/rbasak/adopt.py b/rbasak/adopt.py
 new file mode 100644
index 0000000..a9078cb
--- /dev/null
+++ b/rbasak/adopt.py
@@ -0,0 +1,80 @@
+# adopt.py
+# Author: Robie Basak
+
+# When working in a git repository that contains both maintainer branches and a
+# git-ubuntu branch, this script allows you to "adopt" a non-VCS Ubuntu upload
+# into your maintainer branch.
+#
+# Usage: adopt.py [-p <commit-ish>]... <commit-ish>
+#
+# This will add a new commit to your current branch whose tree is identical to
+# the given git-ubuntu synthesized commit. The author metadata will be taken
+# from the git-ubuntu commit, like a cherry-pick. Changelog entries will be
+# added to the commit message automatically taken from the git-ubuntu changelog
+# notes.
+#
+# Note that this isn't a cherry-pick: the tree in the commit supplied is taken
+# arbitrarily as-is.
+#
+# Example:
+#
+# An Ubuntu developer has uploaded a new upstream version to Ubuntu. You
+# maintain the packaging using the gbp workflow, but your VCS hasn't been
+# updated. You already have the "pkg" remote pointing to the git-ubuntu view of
+# your package. Now you can do:
+#
+# $ git fetch pkg
+# $ git checkout master
+# $ gbp import-orig --no-merge ../<new orig tarball>
+# $ adopt.py -p upstream pkg/ubuntu/devel
+#
+# Now your master branch is updated correctly and future merges of the upstream
+# branch will continue to work.
+#
+# Rough edges:
+#
+# The working tree is not updated, so you probably want "git reset --hard"
+# after running this command. But since this throws things away, I didn't want
+# to have the script do this automatically.
+#
+# Undescriptive error handling - just assertions and stacktraces.
+
+import argparse
+
+import debian.changelog
+import pygit2
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-p', '--parent', action='append')
+parser.add_argument('commit')
+args = parser.parse_args()
+
+repo = pygit2.Repository(pygit2.discover_repository('.'))
+source_commit, _ = repo.resolve_refish(args.commit)
+assert len(source_commit.parents) == 1
+
+parents = [repo.head.peel(pygit2.Commit).id]
+if args.parent:
+    parents.extend(repo.resolve_refish(parent)[0].id for parent in args.parent)
+
+# Ideally this would use gitubuntu.git_repository.follow_symlinks_to_blob() to
+# cover various edge cases but this will do for now.
+changelog = debian.changelog.Changelog(
+    source_commit.peel(pygit2.Tree)['debian']['changelog'].data,
+)
+
+note = repo.lookup_note(str(source_commit.id), 'refs/notes/changelog')
+
+message = f'''Import {changelog.version!s} from Ubuntu
+
+New changelog entries:
+{note.message}'''
+
+repo.create_commit(
+    repo.head.name,
+    source_commit.author,
+    pygit2.Signature(repo.config['user.name'], repo.config['user.email']),
+    message,
+    source_commit.tree.id,
+    parents,
+)
diff --git a/rbasak/chdist-if-migrated b/rbasak/chdist-if-migrated
 new file mode 100755
index 0000000..dfd7778
--- /dev/null
+++ b/rbasak/chdist-if-migrated
@@ -0,0 +1,73 @@
+#!/bin/sh
+set -e
+
+# Author: Robie Basak <[e-mail]>
+
+# Usage:
+# $0 <release> <try_file> apt-get|apt-cache <parameter...>
+#
+# Where try_file is the output line from update_output.txt starting
+# "Trying easy from autohinter:" specifying a list of source packages we
+# propose to migrate to the release pocket.
+#
+# Example use:
+#
+# Get apt to try simulating the installation of <package> following the
+# proposed migration:
+#   $0 try-file apt-get -s install <package>
+
+# Prerequisites:
+# chdist configured and updated with the following dists:
+#   ${release}: only the release pocket included
+#   ${release}-proposed: both release and proposed pockets included
+#   ${release}-proposed-only: only the proposed pocket included
+
+# For debian-installer support, add to each of
+# ~/.chdist/${release}{,-proposed,-proposed-only}/sources.list:
+#
+#     deb http://archive.ubuntu.com/ubuntu ${release} main/debian-installer
+#
+# then update all chdists, and use something like:
+#   $0 try-file apt-get -s install debian-installer-udebs
+
+
+release=$1
+try_file=$2
+command=$3
+shift 3
+
+tmpdir=`mktemp -d`
+cleanup() { rm -rf "$tmpdir"; }
+trap cleanup EXIT
+
+binaries() {
+    chdist_dist=$1
+    cat "$try_file"|sed 's/^Trying easy from autohinter: //g'|tr ' ' "\n"|cut -d/ -f1|xargs -P32 -n1 sh -c 'for p in "$@"; do chdist apt-cache '$chdist_dist' showsrc --only-source $p|grep-dctrl -nsPackage-List .|awk '\''{print $1}'\''|sed '\''/^$/d'\'';done' --
+}
+
+proposed_single_line_binaries=`binaries $release-proposed-only|tr "\n" ' '`
+release_single_line_binaries=`binaries $release|tr "\n" ' '`
+
+cat > "$tmpdir/preferences" <<EOT
+Package: *
+Pin: release a=${release}-proposed
+Pin-Priority: -1
+Explanation: cannot install from proposed except where we say so
+
+Package: $release_single_line_binaries
+Pin: release a=${release}
+Pin-Priority: -1
+Explanation: binaries produced by the release pocket version of the source package would be removed and therefore not available
+
+Package: $proposed_single_line_binaries
+Pin: release a=${release}
+Pin-Priority: -1
+Explanation: binaries being migrated into the release pocket would be elided by their replacements and therefore not available
+
+Package: $proposed_single_line_binaries
+Pin: release a=${release}-proposed
+Pin-Priority: 999
+Explanation: these binaries are proposed to be migrated into the release pocket so would be available
+EOT
+
+chdist "$command" ${release}-proposed -o "Dir::Etc::Preferences=$tmpdir/preferences" "$@"
diff --git a/rbasak/standup_timer.py b/rbasak/standup_timer.py
 new file mode 100644
index 0000000..638952b
--- /dev/null
+++ b/rbasak/standup_timer.py
@@ -0,0 +1,44 @@
+import tkinter
+import tkinter.font
+
+
+WINDOW_Y_SCALE = 0.90
+
+
+class StandupTimer(tkinter.Frame):
+    ALLOTTED_TIME = 60
+
+    def __init__(self, master=None):
+        super().__init__(master)
+        self._remaining_time = 0
+
+        self._label_font = tkinter.font.Font(self.master)
+        self._label = tkinter.Label(self, text=str(self._remaining_time))
+        self._label.config(font=self._label_font, bg="#ffffff")
+        self._label.pack(fill=tkinter.BOTH, expand=tkinter.YES)
+        self.pack()
+        self.master.bind("<Configure>", self._resize)
+        self.master.bind("<Key-space>", self._reset)
+        self.winfo_toplevel().after(1000, self._decrement)
+
+    def _decrement(self):
+        if self._remaining_time > 0:
+            self._remaining_time -= 1
+        self._label.config(text=str(self._remaining_time))
+        self.winfo_toplevel().after(1000, self._decrement)
+
+    def _resize(self, event):
+        self._label_font["size"] = int(
+            self._label.winfo_height() * WINDOW_Y_SCALE
+        )
+
+    def _reset(self, event):
+        self._remaining_time = self.ALLOTTED_TIME
+        self._label.config(text=str(self._remaining_time))
+
+
+if __name__ == "__main__":
+    root = tkinter.Tk()
+    root.config(bg="#ffffff")
+    app = StandupTimer(master=root)
+    app.mainloop()
diff --git a/rma b/rma
 deleted file mode 100755
index 7d455e2..0000000
--- a/rma
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-rmadison -u debian $1 &
-rmadison $1
diff --git a/uscards/AUTHORS.md b/uscards/AUTHORS.md
 new file mode 100644
index 0000000..9712ae3
--- /dev/null
+++ b/uscards/AUTHORS.md
@@ -0,0 +1 @@
+Bryce Harrington <[e-mail]>
diff --git a/uscards/LICENSE.AGPL b/uscards/LICENSE.AGPL
 new file mode 100644
index 0000000..4ec8c3f
--- /dev/null
+++ b/uscards/LICENSE.AGPL
@@ -0,0 +1,619 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
diff --git a/uscards/README b/uscards/README
 new file mode 120000
index 0000000..42061c0
--- /dev/null
+++ b/uscards/README
@@ -0,0 +1 @@
+README.md
 \ No newline at end of file
diff --git a/uscards/README.md b/uscards/README.md
 new file mode 100644
index 0000000..3f25112
--- /dev/null
+++ b/uscards/README.md
@@ -0,0 +1,26 @@
+#                               USCARDS                               #
+
+Ubuntu Server Trello Cards CLI
+
+This collection of scripts provide convenience CLIs to the Ubuntu Server
+team's trello boards.  Each script maps to a specific board and
+implements the team's particular policy logic for that board.
+
+## Use cases ##
+
+  - Get authenticated
+  - List all my open merge cards
+  - List all cards for a specified board and/or list
+  - Add a new card to the TODO list on the roadmap
+  - Create triage and migration duty cards for a given user
+  - Move your triage and migration duty tasks from TODO to Doing
+  - Move your triage and migration duty tasks from Doing to Done
+  - Update the label on a package's card in Roadmap: merges
+  - Append to the description of a card in Roadmap: merges
+
+## Configuration ##
+
+Create ~/.config/uscards.conf with contents such as:
+
+    # USCards configuration
+    TRELLO_USERNAME="myusername"
diff --git a/uscards/docs/design.txt b/uscards/docs/design.txt
 new file mode 100644
index 0000000..0fe9708
--- /dev/null
+++ b/uscards/docs/design.txt
@@ -0,0 +1,100 @@
+                         # Design of Usdaily #
+
+The purpose of usdaily is to give a super convenient way for the server
+team's "Squeaky Wheel" squad to interact with the Trello cards that make
+up the main part of their workflow, from the command line.  In
+particular, it's envisioned this will facilitate further scripting and
+automation of workflows such as merges, SRUs, proposed migration and so
+on.
+
+This is not intended to be a general utility, just be a convenience
+wrapper around the actual general utility, 'so-trello'.  As well, we're
+not intending to implement the full range of the Trello web
+functionality, and accept that certain tasks may just be a lot simpler
+or more convenient to do from the Trello website.
+
+
+### Boards ###
+
+The server team maintains a number of Trello boards, but we're mainly
+concerned with these boards:
+
+  - Daily
+  - [Groovy] Merges Schedule (and Package Merge Status board)
+  - Proposed Migration
+  - SRU
+
+These boards have repetitive aspects to their workflows, which could be
+ameniable to adding trello board update calls as part of a script.
+Development-focused boards like the git-ubuntu roadmap board, that don't
+have repetitive workflow aspects, may not benefit as much from CLI tools
+and for this reason are not included.  Backlog boards are by definition
+rarely interacted with, and thus not included for similar reasons.
+
+Each board is implemented as a separate script.  This is for two
+reasons:  First, it avoids needing to have the user specify the board to
+operate on; and second, each board may have some unique elements to how
+they're used which is best to encapsulate.
+
+Note that there are actually two boards for merges - one that acts more
+like a schedule to plan when merges should happen, and a second that
+registers when merges are available to be done.  In this case, the two
+boards work like different facets on the same workflow - i.e. when
+updating a card on one merge board there may be a corresponding card on
+the other board that would need similarly updated, so a single script is
+designed to interact with both boards.
+
+
+### Operations ###
+
+All of the scripts will support certain core operations:
+
+  - List cards
+  - Add a card
+  - Start a card
+  - Mark a card as ready for review
+  - Add a comment to a card
+  - Finish a card
+
+In some cases, these operations result in moving a card from one list to
+another; in other cases it is achieved via labels.
+
+Except for the 'list' command, all operations will take a card-id.
+so-trello expects the card to be identified by it's textual title, which
+makes sense from a user perspective, but given that the title can be
+edited and changed at will, it may be difficult to rely on so commands
+should also accept card-id's derived from the card URL.  Or if no
+card-id is specified, the operation should prompt the user with a list
+of plausible choices to select from.
+
+There are also some board-specific functionality, that the scripts are
+intended to facilitate:
+
+  - The Merges Schedule are organized with a list of cards per month, so
+    being able to see still-active merges for a range of months
+    (e.g. current month and before) is useful.
+
+  - The Proposed Migration board uses the first card in some lists as
+    documentation for the list.
+
+
+### Coding Approach ###
+
+'uscards' is kept in Bash deliberately, both to keep implementation
+more accessible to team members, and to encourage keeping implementation
+streamlined and simple.  Apart from 'so-trello' (which can be easily
+installed via snap), there are no installation dependencies, and the
+individual scripts can be self-contained as single files.
+
+The use of 'so-trello' was motivated by these design constraints,
+however other options were considered including coding in python and
+using the python-trello module.  An earlier effort, 'postcard' was
+written purely in Python, but its attempt to provide both the frontend
+CLI and the backend Trello interfacing, resulted in unnecessary
+complexity.
+
+Another option considered was Report2Trello, a python toolset built
+around the python-trello module, focused on bulk-update use cases to
+generate and update boards based off of external data sources; 'uscards'
+focuses more on a command-line interface way of interacting with the
+boards.
diff --git a/uscards/install.sh b/uscards/install.sh
 new file mode 100755
index 0000000..c9bbaa3
--- /dev/null
+++ b/uscards/install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+dest="${1:-/usr/local/bin/}"
+
+for script in scripts/*; do 
+    if [ -x "${script}" ]; then
+	cp -v "${script}" "${dest}"
+    fi
+done
diff --git a/uscards/scripts/sru-board b/uscards/scripts/sru-board
 new file mode 100755
index 0000000..59eaef6
--- /dev/null
+++ b/uscards/scripts/sru-board
@@ -0,0 +1,158 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# This script uses so-trello to update cards on the Ubuntu SRU
+# Trello board.
+#
+# Copyright (C) 2020 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+progdir=$(dirname "$(readlink -f "${0}")")
+scriptsdir="${progdir}/../scripts"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [options] <command [params]>
+
+Commands:
+    list                Display your open cards
+    finish <card-title> Move card to Done column
+
+Options:
+    -h, --help     This help listing
+EOF
+    exit $1
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+card_id() {
+    local card="${1}"
+
+    if [[ "${card}" =~ "https://trello.com/"* ]]; then
+	# Looks like a card URL
+	echo "${card##*/}"
+	return 0
+    else
+	echo "${card}"
+	return 0
+    fi
+
+    warn "Could not parse card id from '${card}'"
+    return 1
+}
+
+
+#####################
+### Parse Options ###
+#####################
+
+parse_args() {
+    # Transform long options to short ones
+    for arg in "$@"; do
+	shift
+	case "${arg}" in
+	    "--help")     set -- "$@" "-h"               ;;
+	    "--*")        usage 1                        ;;
+	    *)            set -- "$@" "${arg}"
+	esac
+    done
+
+    # Parse short options
+    OPTIND=1
+    while getopts "h\?" opt $*; do
+	case "${opt}" in
+	    h | \?) usage 0;                             ;;
+	    * ) die "Unknown option '${opt}'"            ;;
+	esac
+    done
+    shift $(expr ${OPTIND} - 1)
+}
+
+############
+### Main ###
+############
+
+function main() {
+    # Parse options
+    parse_args "$@" \
+	|| die "Could not process options"
+    command="${1}" && shift
+    [ -n "${command}" ] || usage 1
+
+    if [ -e ~/.config/uscards.conf ]; then
+	source ~/.config/uscards.conf
+    elif [ -z "${TRELLO_USERNAME}" ]; then
+	die "TRELLO_USERNAME env var needs to be set to your trello account name"
+    fi
+
+    my_boards=$(so-trello member-boards)
+    sru_board_id=$(echo "${my_boards}" | grep "SRU" | cut -d' ' -f1)
+    sru_lists=$(so-trello board-lists --board "${sru_board_id}")
+
+    list_languishing=$(echo "${sru_lists}" | grep "Languishing" | cut -d' ' -f1)
+    list_todo=$(echo "${sru_lists}" | grep "To *Do" | cut -d' ' -f1)
+    list_doing=$(echo "${sru_lists}" | grep "Doing" | cut -d' ' -f1)
+    list_done=$(echo "${sru_lists}" | grep "Done" | cut -d' ' -f1)
+
+    case "${command}" in
+	list)
+	    echo "Languishing:"
+	    so-trello list-cards --list "${list_languishing}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "To Do:"
+	    so-trello list-cards --list "${list_todo}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "Doing:"
+	    so-trello list-cards --list "${list_doing}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+	    ;;
+
+	finish)
+	    card=$(card_id "${1}")
+	    [ -n "${card}" ] || usage 1
+
+	    so-trello card-update --board "${sru_board_id}" \
+		      --update-board "${sru_board_id}" --update-list "${list_done}" \
+		       --card "${card}"
+	    ;;
+
+	help)
+	    usage 0
+	    ;;
+	*)
+	    usage 1
+	    ;;
+    esac
+
+    # Subcommands to add:
+    # * start <card>  # Moves from TODO column to the Doing column
+    # * finish <card> # Moves to the DONE column
+}
+
+if [[ "${0}" == "${BASH_SOURCE}" ]]; then
+    main "$@"
+fi
diff --git a/uscards/scripts/uscoredev b/uscards/scripts/uscoredev
 new file mode 100755
index 0000000..1f2688b
--- /dev/null
+++ b/uscards/scripts/uscoredev
@@ -0,0 +1,189 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# This script uses so-trello to dump cards from a prospective
+# core-dev applicant's Trello board.
+#
+# Copyright (C) 2021 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+progdir=$(dirname "$(readlink -f "${0}")")
+scriptsdir="${progdir}/../scripts"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [options]
+
+Commands:
+    list           Generate a Moinmoin-style dump of cards from Trello
+    help           This help listing
+
+Parameters:
+    <name>         First part of board title, i.e. "<name> Core Dev Roadmap"
+
+Options:
+    -h, --help     This help listing
+EOF
+    exit $1
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+card_id() {
+    local card="${1}"
+
+    if [[ "${card}" =~ ${re_number} ]]; then
+	# Treat as the card id directly
+	echo "${card}"
+	return 0
+    elif [[ "${card}" =~ "https://trello.com/"* ]]; then
+	# Looks like a card URL
+	echo "${card##*/}"
+	return 0
+    fi
+
+    warn "Could not parse card id from '${card}'"
+    return 1
+}
+
+#####################
+### Parse Options ###
+#####################
+
+parse_args() {
+    # Transform long options to short ones
+    for arg in "$@"; do
+	shift
+	case "${arg}" in
+	    "--help")     set -- "$@" "-h"               ;;
+	    "--*")        usage 1                        ;;
+	    *)            set -- "$@" "${arg}"
+	esac
+    done
+
+    # Parse short options
+    OPTIND=1
+    while getopts "h\?" opt $*; do
+	case "${opt}" in
+	    h | \?) usage 0;                             ;;
+	    * ) die "Unknown option '${opt}'"            ;;
+	esac
+    done
+    shift $(expr ${OPTIND} - 1)
+}
+
+############
+### Main ###
+############
+
+function main() {
+    # Parse options
+    parse_args "$@" \
+	|| die "Could not process options"
+
+    if [ -e ~/.config/uscards.conf ]; then
+	source ~/.config/uscards.conf
+    elif [ -z "${TRELLO_USERNAME}" ]; then
+	die "TRELLO_USERNAME env var needs to be set to your trello account name"
+    fi
+
+    # Command to execute
+    command="${1}" && shift
+    [ -n "${command}" ] || usage 1
+
+    # Name and ID of the trello board
+    name="${@}"
+    my_boards=$(so-trello member-boards)
+    if [ -z "${name}" ]; then
+	num_boards=$(echo "${my_boards}" | grep -i "Core Dev Roadmap" | grep -v "Example" | wc -l)
+	if [ "${num_boards}" = 0 ]; then
+	    # User has no core-dev roadmaps, so use the example
+	    coredev_board_id=$(echo "${my_boards}" | grep -i "Example Core Dev Roadmap" | cut -d' ' -f1)
+	elif [ "${num_boards}" = "1" ]; then
+	    # User has exactly one board (common case)
+	    coredev_board_id=$(echo "${my_boards}" | grep -i "Core Dev Roadmap" | grep -v "Example" | cut -d' ' -f1)
+	else
+	    # TODO: Present user with list to choose from
+	    usage 1
+	fi
+    else
+	coredev_board_id=$(echo "${my_boards}" | grep -i "${name} Core Dev Roadmap" | cut -d' ' -f1)
+    fi
+    coredev_board_name=$(echo "${my_boards}" | grep -i "^${coredev_board_id}" | cut -d' ' -f2-)
+
+    # Column names
+    coredev_lists=$(so-trello board-lists --board "${coredev_board_id}")
+    selected_lists=$(echo "${coredev_lists}" | grep -v TODO | grep -v Doing)
+
+    case "${command}" in
+	list)
+	    echo "== ${coredev_board_name/Core Dev Roadmap/Involvement} =="
+	    echo
+	    echo "=== Examples of my work ==="
+	    echo
+	    for list in $(echo "${selected_lists}" | cut -d' ' -f1); do
+		list_name=$(so-trello list --board "${coredev_board_id}" --list "${list}" | cut -d' ' -f2-)
+		cards=$(so-trello list-cards --list "${list}")
+		if [ -n "${cards}" ]; then
+		    echo "${list_name}:"
+		    for card_id in $(echo "${cards}" | cut -d' ' -f1); do
+			# Get the card's title
+			card_title=$(echo "${cards}" | grep "^${card_id}" | cut -d' ' -f2-)
+
+			# Extract work item link from card description
+			#echo "so-trello card --board \"${coredev_board_id}\" --card \"${card_id}\" --raw json | jq .desc"
+			card_desc=$(so-trello card --board "${coredev_board_id}" --card "${card_id}" --raw json | jq .desc)
+			link=$(echo "${card_desc//\"/}" | egrep -o 'https?://[^ ]+')
+			if [ -z "${link}" ]; then
+			    echo " * ${card_title}"
+			else
+			    link_number=$(echo "${link}" | egrep -o '[0-9]+$')
+			    if [ -z "${link_number}" ]; then
+				link_text="link"
+			    elif [[ "${link}" == *"+bug"* ]]; then
+				link_text="LP: #${link_number}"
+			    elif [[ "${link}" == *"+merge"* ]]; then
+				link_text="MP: #${link_number}"
+			    fi
+			    echo " * ${card_title} - [[${link}|${link_text}]]"
+			fi
+		    done
+		fi
+		echo
+	    done
+	    ;;
+
+	help)
+	    usage 0
+	    ;;
+	*)
+	    usage 1
+	    ;;
+    esac
+    exit
+}
+
+if [[ "${0}" == "${BASH_SOURCE}" ]]; then
+    main "$@"
+fi
diff --git a/uscards/scripts/usdaily b/uscards/scripts/usdaily
 new file mode 100755
index 0000000..04e156c
--- /dev/null
+++ b/uscards/scripts/usdaily
@@ -0,0 +1,186 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+#
+# This script uses so-trello to update cards on the Ubuntu Server team's
+# Daily Trello board.
+#
+# Copyright (C) 2020 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+progdir=$(dirname "$(readlink -f "${0}")")
+scriptsdir="${progdir}/../scripts"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [options] <command [params]>
+
+Commands:
+    list		Display your open cards
+    add <card-title>    Adds card with given title to TODO list
+    finish <card-id>	Move card to Done column
+
+Options:
+    -h, --help     This help listing
+EOF
+    exit $1
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+card_id() {
+    local card="${1}"
+
+    if [[ "${card}" =~ "https://trello.com/"* ]]; then
+	# Looks like a card URL
+	echo "${card##*/}"
+	return 0
+    else
+	echo "${card}"
+	return 0
+    fi
+
+    warn "Could not parse card id from '${card}'"
+    return 1
+}
+
+#####################
+### Parse Options ###
+#####################
+
+parse_args() {
+    # Transform long options to short ones
+    for arg in "$@"; do
+	shift
+	case "${arg}" in
+	    "--help")     set -- "$@" "-h"               ;;
+	    "--*")        usage 1                        ;;
+	    *)            set -- "$@" "${arg}"
+	esac
+    done
+
+    # Parse short options
+    OPTIND=1
+    while getopts "h\?" opt $*; do
+	case "${opt}" in
+	    h | \?) usage 0;                             ;;
+	    * ) die "Unknown option '${opt}'"            ;;
+	esac
+    done
+    shift $(expr ${OPTIND} - 1)
+}
+
+
+############
+### Main ###
+############
+
+function main() {
+    # Parse options and command
+    parse_args $@ \
+	|| die "Could not process options"
+    command="${1}" && shift
+    [ -n "${command}" ] || usage 1
+
+    if [ -e ~/.config/uscards.conf ]; then
+	source ~/.config/uscards.conf
+    elif [ -z "${TRELLO_USERNAME}" ]; then
+	die "TRELLO_USERNAME env var needs to be set to your trello account name"
+    fi
+
+    my_boards=$(so-trello member-boards)
+    daily_board_id=$(echo "${my_boards}" | grep -i "Daily Ubuntu Server" | cut -d' ' -f1)
+    daily_lists=$(so-trello board-lists --board "${daily_board_id}")
+
+    list_todo=$(echo "${daily_lists}" | grep "TODO" | cut -d' ' -f1)
+    list_doing=$(echo "${daily_lists}" | grep -i "Doing" | cut -d' ' -f1)
+    list_review=$(echo "${daily_lists}" | grep -i "Review" | cut -d' ' -f1)
+    list_external_dependency=$(echo "${daily_lists}" | grep -i "EXTERNAL DEPENDENCY" | cut -d' ' -f1)
+    list_done=$(echo "${daily_lists}" | grep "Done" | cut -d' ' -f1)
+
+    # TODO: Verify the above actually exist
+
+    case "${command}" in
+	list)
+	    echo "TODO:"
+	    so-trello list-cards --list "${list_todo}" --is-member "${TRELLO_USERNAME}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "Doing:"
+	    so-trello list-cards --list "${list_doing}" --is-member "${TRELLO_USERNAME}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "Reviews:"
+	    so-trello list-cards --list "${list_review}" --is-member "${TRELLO_USERNAME}" | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+	    ;;
+
+	add)
+	    local name="${@}"
+	    [ -n "${name}" ] || usage 1
+
+	    # By default, use the "TODO" list
+	    local list="TODO"
+
+	    # Check if stdin comes from terminal or a pipe
+	    if [ -t 0 ]; then
+		# Terminal.  Just add card with title.
+		so-trello list-addcard \
+			  --board "${daily_board_id}" \
+			  --list "${list}" \
+			  --card-name "${name}"
+		echo "${name}:\n${description}"
+	    else
+		# Pipe.  Use stdin as the description.
+		local description=$(cat <&0)
+		so-trello list-addcard \
+			  --board "${daily_board_id}" \
+			  --list "${list}" \
+			  --card-name "${name}" \
+			  --card-desc "${description}"
+		echo "${name}:"
+		echo "${description}"
+	    fi
+	    ;;
+
+	finish)
+	    card=$(card_id "${1}")
+	    [ -n "${card}" ] || usage 1
+
+	    so-trello card-update --board "${daily_board_id}" \
+		      --update-board "${daily_board_id}" --update-list "${list_done}" \
+		       --card "${card}"
+	    ;;
+
+	help)
+	    usage 0
+	    ;;
+	*)
+	    usage 1
+	    ;;
+    esac
+}
+
+if [[ "${0}" == "${BASH_SOURCE}" ]]; then
+    main "$@"
+fi
diff --git a/uscards/scripts/usmerges b/uscards/scripts/usmerges
 new file mode 100755
index 0000000..0aa4d6a
--- /dev/null
+++ b/uscards/scripts/usmerges
@@ -0,0 +1,194 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+
+# This script uses so-trello to update cards on the Ubuntu Server team's
+# Merges Trello board.
+#
+# Copyright (C) 2020 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+progdir=$(dirname "$(readlink -f "${0}")")
+scriptsdir="${progdir}/../scripts"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [options]
+
+Commands:
+    list                Display your open cards
+    add <card-title)    Add card with given title to current month
+    finish <card-id>    Move card to Done column
+
+Options:
+    -h, --help     This help listing
+EOF
+    exit $1
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+card_id() {
+    local card="${1}"
+
+    if [[ "${card}" =~ "https://trello.com/"* ]]; then
+	# Looks like a card URL
+	echo "${card##*/}"
+	return 0
+    else
+	echo "${card}"
+	return 0
+    fi
+
+    warn "Could not parse card id from '${card}'"
+    return 1
+}
+
+#####################
+### Parse Options ###
+#####################
+
+parse_args() {
+    # Transform long options to short ones
+    for arg in "$@"; do
+	shift
+	case "${arg}" in
+	    "--help")     set -- "$@" "-h"               ;;
+	    "--*")        usage 1                        ;;
+	    *)            set -- "$@" "${arg}"
+	esac
+    done
+
+    # Parse short options
+    OPTIND=1
+    while getopts "h\?" opt $*; do
+	case "${opt}" in
+	    h | \?) usage 0;                             ;;
+	    * ) die "Unknown option '${opt}'"            ;;
+	esac
+    done
+    shift $(expr ${OPTIND} - 1)
+}
+
+############
+### Main ###
+############
+
+function main() {
+    # Parse options
+    parse_args "$@" \
+	|| die "Could not process options"
+    command="${1}" && shift
+    [ -n "${command}" ] || usage 1
+
+    if [ -e ~/.config/uscards.conf ]; then
+	source ~/.config/uscards.conf
+    elif [ -z "${TRELLO_USERNAME}" ]; then
+	die "TRELLO_USERNAME env var needs to be set to your trello account name"
+    fi
+
+    my_boards=$(so-trello member-boards)
+    merges_board_id=$(echo "${my_boards}" | grep -i "Merges Schedule" | cut -d' ' -f1)
+    merges_board_name=$(echo "${my_boards}" | grep -i "Merges Schedule" | cut -d' ' -f2-)
+    merges_lists=$(so-trello board-lists --board "${merges_board_id}")
+
+    backlog_lists=$(echo "${merges_lists}" | grep -i backlog)
+    active_lists=$(echo "${merges_lists}" | grep -iv backlog)
+
+    selected_lists="${active_lists}"
+
+    case "${command}" in
+	list)
+	    echo "${merges_board_name}:"
+	    for list in $(echo "${selected_lists}" | cut -d' ' -f1); do
+		list_name=$(so-trello list --list "${list}" | cut -d' ' -f2-)
+		cards=$(so-trello list-cards --list "${list}" --is-member "${TRELLO_USERNAME}")
+		if [ -n "${cards}" ]; then
+		    echo "* ${list_name}:"
+		    for card in "${cards}"; do
+			card_id=$(echo "${card}" | cut -d' ' -f1)
+			card_title=$(echo "${card}" | cut -d' ' -f2-)
+			echo "${card_title}" | sed -e 's/^/  - /'
+			# TODO: Get some card properties we want to display
+			#       echo so-trello card --board "${merges_board_id}" --card "${card_id}" --raw json
+		    done
+		fi
+	    done
+	    ;;
+
+	add)
+	    local name="${@}"
+	    [ -n "${name}" ] || usage 1
+
+	    # By default, use the list for the current month
+	    local list=$(date +%y.%m)
+	    # TODO: Verify the list exists
+
+	    # Check if stdin comes from terminal or a pipe
+	    if [ -t 0 ]; then
+		# Terminal.  Just add card with title.
+		so-trello list-addcard \
+			  --board "${merges_board_id}" \
+			  --list "${list}" \
+			  --card-name "${name}"
+		echo "${name}:"
+		echo "${description}"
+	    else
+		# Pipe.  Use stdin as the description.
+		local description=$(cat <&0)
+		so-trello list-addcard \
+			  --board "${merges_board_id}" \
+			  --list "${list}" \
+			  --card-name "${name}" \
+			  --card-desc "${description}"
+		echo "${name}:"
+		echo "${description}"
+	    fi
+	    ;;
+
+	finish)
+	    card=$(card_id "${1}")
+	    [ -n "${card}" ] || usage 1
+
+	    # TODO: Need to set 'DONE' on card
+	    #so-trello card-update --board "${merges_board_id}" \
+	    #          --update-board "${merges_board_id}" --update-list "${list_done}" \
+	    #           --card "${card}"
+	    ;;
+
+	help)
+	    usage 0
+	    ;;
+	*)
+	    usage 1
+	    ;;
+    esac
+
+    # Subcommands to add:
+    # * start <card>  # Moves from TODO column to the Doing column
+    # * submit <card> # Moves to the Review column
+}
+
+if [[ "${0}" == "${BASH_SOURCE}" ]]; then
+    main "$@"
+fi
diff --git a/uscards/scripts/usmigration b/uscards/scripts/usmigration
 new file mode 100755
index 0000000..feadefd
--- /dev/null
+++ b/uscards/scripts/usmigration
@@ -0,0 +1,161 @@
+#!/bin/bash
+# -*- coding: utf-8; mode: sh -*-
+#
+# Proposed migration trello board CLI
+#
+# Copyright (C) 2020 Bryce W. Harrington <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+progname=$(basename "${0}")
+progdir=$(dirname "$(readlink -f "${0}")")
+scriptsdir="${progdir}/../scripts"
+
+usage() {
+    cat >&2 <<EOF
+Usage: ${progname} [options]
+
+Commands:
+    list                Display migration issues that need attention
+    finish <card-title> Move card to Done column
+
+Options:
+    -h, --help     This help listing
+EOF
+    exit $1
+}
+
+warn() {
+    echo "Warning:  $1" 1>&2
+}
+
+die() {
+    echo "Error:  $1" 1>&2
+    exit 1
+}
+
+card_id() {
+    local card="${1}"
+
+    if [[ "${card}" =~ "https://trello.com/"* ]]; then
+	# Looks like a card URL
+	echo "${card##*/}"
+	return 0
+    else
+	echo "${card}"
+	return 0
+    fi
+
+    warn "Could not parse card id from '${card}'"
+    return 1
+}
+
+
+#####################
+### Parse Options ###
+#####################
+
+parse_args() {
+    # Transform long options to short ones
+    for arg in "$@"; do
+	shift
+	case "${arg}" in
+	    "--help")     set -- "$@" "-h"               ;;
+	    "--*")        usage 1                        ;;
+	    *)            set -- "$@" "${arg}"
+	esac
+    done
+
+    # Parse short options
+    OPTIND=1
+    while getopts "h\?" opt $*; do
+	case "${opt}" in
+	    h | \?) usage 0;                             ;;
+	    * ) die "Unknown option '${opt}'"            ;;
+	esac
+    done
+    shift $(expr ${OPTIND} - 1)
+}
+
+
+
+############
+### Main ###
+############
+
+function main() {
+    # Parse options
+    parse_args "$@" \
+	|| die "Could not process options"
+
+    command="${1}" && shift
+    [ -n "${command}" ] || usage 1
+
+    if [ -e ~/.config/uscards.conf ]; then
+	source ~/.config/uscards.conf
+    elif [ -z "${TRELLO_USERNAME}" ]; then
+	die "TRELLO_USERNAME env var needs to be set to your trello account name"
+    fi
+
+    my_boards=$(so-trello member-boards)
+    migration_board_id=$(echo "${my_boards}" | grep -i "Proposed Migration" | cut -d' ' -f1)
+    migration_lists=$(so-trello board-lists --board "${migration_board_id}")
+
+    list_languishing=$(echo "${migration_lists}" | grep "Languishing" | cut -d' ' -f1)
+    list_todo=$(echo "${migration_lists}" | egrep "To *Do" | cut -d' ' -f1)
+    list_doing=$(echo "${migration_lists}" | egrep "Doing" | cut -d' ' -f1)
+    list_blocked=$(echo "${migration_lists}" | egrep "Blocked" | cut -d' ' -f1)
+    list_done=$(echo "${migration_lists}" | egrep "Done" | cut -d' ' -f1)
+    list_pending=$(echo "${migration_lists}" | egrep "Pending" | cut -d' ' -f1)
+
+    # TODO: Verify the above actually exist
+
+    case "${command}" in
+	list)
+	    echo "Languishing:"
+	    so-trello list-cards --list "${list_languishing}" --is-unassigned | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "TODO:"
+	    so-trello list-cards --list "${list_todo}" --is-unassigned | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+
+	    echo "Doing:"
+	    so-trello list-cards --list "${list_doing}" --is-unassigned | cut -d' ' -f2- | sed -e 's/^/* /'
+	    echo
+	    ;;
+
+	finish)
+	    card=$(card_id "${1}")
+	    [ -n "${card}" ] || usage 1
+
+	    so-trello card-update --board "${migration_board_id}" \
+		      --update-board "${migration_board_id}" --update-list "${list_done}" \
+		      --card "${card}"
+	    ;;
+
+        help)
+            usage 0
+            ;;
+        *)
+            usage 1
+            ;;
+
+    esac
+}
+
+if [[ "${0}" == "${BASH_SOURCE}" ]]; then
+    main "$@"
+fi