From afcbd1bd06ada0d926e474211a2c5e489fa38b74 Mon Sep 17 00:00:00 2001
From: Peter Wilmott <p@p8952.info>
Date: Mon, 27 Jul 2015 19:18:43 +0100
Subject: [PATCH] Open functions on the same line that the previous function
 closes

---
 bocker | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/bocker b/bocker
index 8856cb2..2b7d127 100755
--- a/bocker
+++ b/bocker
@@ -3,8 +3,7 @@ set -o errexit -o nounset -o pipefail; shopt -s nullglob
 btrfs_path='/var/bocker';
 function bocker_check() {
 	btrfs subvolume list "$btrfs_path" | grep -qw "$1" && echo 0 || echo 1
-}
-function bocker_init() { #HELP Create an image from a directory:\nBOCKER init <directory>
+}; function bocker_init() { #HELP Create an image from a directory:\nBOCKER init <directory>
 	uuid="img_$(shuf -i 42002-42254 -n 1)"
 	if [[ -d "$1" ]]; then
 		[[ "$(bocker_check "$uuid")" == 0 ]] && bocker_run "$@"
@@ -15,8 +14,7 @@ function bocker_init() { #HELP Create an image from a directory:\nBOCKER init <d
 	else
 		echo "No directory named '$1' exists"
 	fi
-}
-function bocker_pull() { #HELP Pull an image from Docker Hub:\nBOCKER pull <name> <tag>
+}; function bocker_pull() { #HELP Pull an image from Docker Hub:\nBOCKER pull <name> <tag>
 	token="$(curl -sL -o /dev/null -D- -H 'X-Docker-Token: true' "https://index.docker.io/v1/repositories/$1/images" | tr -d '\r' | awk -F ': *' '$1 == "X-Docker-Token" { print $2 }')"
 	registry='https://registry-1.docker.io/v1'
 	id="$(curl -sL -H "Authorization: Token $token" "$registry/repositories/$1/tags/$2" | sed 's/"//g')"
@@ -29,27 +27,23 @@ function bocker_pull() { #HELP Pull an image from Docker Hub:\nBOCKER pull <name
 	done
 	echo "$1:$2" > /tmp/"$tmp_uuid"/img.source
 	bocker_init /tmp/"$tmp_uuid" && rm -rf /tmp/"$tmp_uuid"
-}
-function bocker_rm() { #HELP Delete an image or container:\nBOCKER rm <image_id or container_id>
+}; function bocker_rm() { #HELP Delete an image or container:\nBOCKER rm <image_id or container_id>
 	[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1
 	btrfs subvolume delete "$btrfs_path/$1" > /dev/null
 	echo "Removed: $1"
-}
-function bocker_images() { #HELP List images:\nBOCKER images
+}; function bocker_images() { #HELP List images:\nBOCKER images
 	echo -e "IMAGE_ID\t\tSOURCE"
 	for img in "$btrfs_path"/img_*; do
 		img=$(basename "$img")
 		echo -e "$img\t\t$(cat "$btrfs_path/$img/img.source")"
 	done
-}
-function bocker_ps() { #HELP List containers:\nBOCKER ps
+}; function bocker_ps() { #HELP List containers:\nBOCKER ps
 	echo -e "CONTAINER_ID\t\tCOMMAND"
 	for ps in "$btrfs_path"/ps_*; do
 		ps=$(basename "$ps")
 		echo -e "$ps\t\t$(cat "$btrfs_path/$ps/$ps.cmd")"
 	done
-}
-function bocker_run() { #HELP Create a container:\nBOCKER run <image_id> <command>
+}; function bocker_run() { #HELP Create a container:\nBOCKER run <image_id> <command>
 	uuid="ps_$(shuf -i 42002-42254 -n 1)"
 	[[ "$(bocker_check "$1")" == 1 ]] && echo "No image named '$1' exists" && exit 1
 	[[ "$(bocker_check "$uuid")" == 0 ]] && echo "UUID conflict, retrying..." && bocker_run "$@" && return
@@ -72,26 +66,21 @@ function bocker_run() { #HELP Create a container:\nBOCKER run <image_id> <comman
 		2>&1 | tee "$btrfs_path/$uuid/$uuid.log" || true
 	ip link del dev veth0_"$uuid"
 	ip netns del netns_"$uuid"
-}
-function bocker_exec() { #HELP Execute a command in an existing container:\nBOCKER exec <container_id> <command>
+}; function bocker_exec() { #HELP Execute a command in an existing container:\nBOCKER exec <container_id> <command>
 	[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1
 	cmd=${@:2} && cid=$(ps xao ppid,pid,cmd | grep "$(ps -u | grep unshare | grep "$1" | awk '{ print $2 }')" | grep -v unshare | awk '{ print $2 }')
 	nsenter -t "$cid" -muinp chroot "$btrfs_path/$1" "$cmd"
-}
-function bocker_logs() { #HELP View logs from a container:\nBOCKER logs <container_id>
+}; function bocker_logs() { #HELP View logs from a container:\nBOCKER logs <container_id>
 	[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1
 	cat "$btrfs_path/$1/$1.log"
-}
-function bocker_commit() { #HELP Commit a container to an image:\nBOCKER commit <container_id> <image_id>
+}; function bocker_commit() { #HELP Commit a container to an image:\nBOCKER commit <container_id> <image_id>
 	[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1
 	[[ "$(bocker_check "$2")" == 1 ]] && echo "No image named '$1' exists" && exit 1
 	bocker_rm "$2" && btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$2" > /dev/null
 	echo "Created: $2"
-}
-function bocker_help() { #HELP Display this message:\nBOCKER help
+}; function bocker_help() { #HELP Display this message:\nBOCKER help
 	sed -n "s/^.*#HELP\\s//p;" < "$1" | sed "s/\\\\n/\n\t/g;s/$/\n/;s!BOCKER!${1/!/\\!}!g"
-}
-[[ -z "${1-}" ]] && bocker_help "$0"
+}; [[ -z "${1-}" ]] && bocker_help "$0"
 case $1 in
 	pull|init|rm|images|ps|run|exec|logs|commit) bocker_"$1" "${@:2}" ;;
 	*) bocker_help "$0" ;;