From 1e719991e0847f5a874052445ae6697003ea2ffe Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 8 Aug 2014 13:16:12 -0600
Subject: [PATCH] Simplify repo logic by allowing "repo" to include a slash

---
 update.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/update.sh b/update.sh
index bf36721..2f1564b 100755
--- a/update.sh
+++ b/update.sh
@@ -9,9 +9,6 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
-user="$(docker info | awk '/^Username:/ { print $2 }')"
-[ -z "$user" ] || user="$user/"
-
 get_part() {
 	dir="$1"
 	shift
@@ -33,6 +30,14 @@ get_part() {
 }
 
 repo="$(get_part . repo '')"
+if [ "$repo" ]; then
+	if [[ "$repo" != */* ]]; then
+		user="$(docker info | awk '/^Username:/ { print $2 }')"
+		if [ "$user" ]; then
+			repo="$user/$repo"
+		fi
+	fi
+fi
 
 for version in "${versions[@]}"; do
 	dir="$(readlink -f "$version")"
@@ -61,11 +66,11 @@ for version in "${versions[@]}"; do
 	sudo chown -R "$(id -u):$(id -g)" "$dir"
 	
 	if [ "$repo" ]; then
-		docker build -t "${user}${repo}:${suite}" "$dir"
+		docker build -t "${repo}:${suite}" "$dir"
 		if [ "$suite" != "$version" ]; then
-			docker tag "${user}${repo}:${suite}" "${user}${repo}:${version}"
+			docker tag "${repo}:${suite}" "${repo}:${version}"
 		fi
-		docker run -it --rm "${user}${repo}:${suite}" bash -xc '
+		docker run -it --rm "${repo}:${suite}" bash -xc '
 			cat /etc/apt/sources.list
 			echo
 			cat /etc/os-release 2>/dev/null
@@ -80,5 +85,5 @@ done
 
 latest="$(get_part . latest '')"
 if [ "$latest" ]; then
-	docker tag "${user}${repo}:${latest}" "${user}${repo}:latest"
+	docker tag "${repo}:${latest}" "${repo}:latest"
 fi