@@ -43,7 +43,7 @@ is_set_as_module() {

 color() {

 	local codes=()

 	if [ "$1" = 'bold' ]; then

-		codes=( "${codes[@]}" '1' )

+		codes=("${codes[@]}" '1')

 		shift

 	fi

 	if [ "$#" -gt 0 ]; then

@@ -60,7 +60,7 @@ color() {

 			white) code=37 ;;

 		esac

 		if [ "$code" ]; then

-			codes=( "${codes[@]}" "$code" )

+			codes=("${codes[@]}" "$code")

 		fi

 	fi

 	local IFS=';'

@@ -98,12 +98,13 @@ check_flag() {

 check_flags() {

 	for flag in "$@"; do

-		echo -n "- "; check_flag "$flag"

+		echo -n "- "

+		check_flag "$flag"

 	done

 }

 check_command() {

-	if command -v "$1" >/dev/null 2>&1; then

+	if command -v "$1" > /dev/null 2>&1; then

 		wrap_good "$1 command" 'available'

 	else

 		wrap_bad "$1 command" 'missing'

@@ -121,7 +122,7 @@ check_device() {

 }

 check_distro_userns() {

-	source /etc/os-release 2>/dev/null || /bin/true

+	source /etc/os-release 2> /dev/null || /bin/true

 	if [[ "${ID}" =~ ^(centos|rhel)$ && "${VERSION_ID}" =~ ^7 ]]; then

 		# this is a CentOS7 or RHEL7 system

 		grep -q "user_namespace.enable=1" /proc/cmdline || {

@@ -156,7 +157,7 @@ echo 'Generally Necessary:'

 echo -n '- '

 cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)"

 cgroupDir="$(dirname "$cgroupSubsystemDir")"

-if [ -d "$cgroupDir/cpu" ] || [ -d "$cgroupDir/cpuacct" ] || [ -d "$cgroupDir/cpuset" ] || [  -d "$cgroupDir/devices" ] || [ -d "$cgroupDir/freezer" ] || [ -d "$cgroupDir/memory" ]; then

+if [ -d "$cgroupDir/cpu" ] || [ -d "$cgroupDir/cpuacct" ] || [ -d "$cgroupDir/cpuset" ] || [ -d "$cgroupDir/devices" ] || [ -d "$cgroupDir/freezer" ] || [ -d "$cgroupDir/memory" ]; then

 	echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]"

 else

 	if [ "$cgroupSubsystemDir" ]; then

@@ -168,7 +169,7 @@ else

 	echo "    $(wrap_color '(see https://github.com/tianon/cgroupfs-mount)' yellow)"

 fi

-if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then

+if [ "$(cat /sys/module/apparmor/parameters/enabled 2> /dev/null)" = 'Y' ]; then

 	echo -n '- '

 	if command -v apparmor_parser &> /dev/null; then

 		wrap_good 'apparmor' 'enabled and tools installed'

@@ -199,8 +200,8 @@ flags=(

 	POSIX_MQUEUE

 )

 check_flags "${flags[@]}"

-if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt 8 ] ); then

-        check_flags DEVPTS_MULTIPLE_INSTANCES

+if [ "$kernelMajor" -lt 4 ] || ([ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt 8 ]); then

+	check_flags DEVPTS_MULTIPLE_INSTANCES

 fi

 echo

@@ -228,12 +229,15 @@ echo 'Optional Features:'

 }

 {

 	if is_set LEGACY_VSYSCALL_NATIVE; then

-		echo -n "- "; wrap_bad "CONFIG_LEGACY_VSYSCALL_NATIVE" 'enabled'

+		echo -n "- "

+		wrap_bad "CONFIG_LEGACY_VSYSCALL_NATIVE" 'enabled'

 		echo "    $(wrap_color '(dangerous, provides an ASLR-bypassing target with usable ROP gadgets.)' bold black)"

 	elif is_set LEGACY_VSYSCALL_EMULATE; then

-		echo -n "- "; wrap_good "CONFIG_LEGACY_VSYSCALL_EMULATE" 'enabled'

+		echo -n "- "

+		wrap_good "CONFIG_LEGACY_VSYSCALL_EMULATE" 'enabled'

 	elif is_set LEGACY_VSYSCALL_NONE; then

-		echo -n "- "; wrap_bad "CONFIG_LEGACY_VSYSCALL_NONE" 'enabled'

+		echo -n "- "

+		wrap_bad "CONFIG_LEGACY_VSYSCALL_NONE" 'enabled'

 		echo "    $(wrap_color '(containers using eglibc <= 2.13 will not work. Switch to' bold black)"

 		echo "    $(wrap_color ' "CONFIG_VSYSCALL_[NATIVE|EMULATE]" or use "vsyscall=[native|emulate]"' bold black)"

 		echo "    $(wrap_color ' on kernel command line. Note that this will disable ASLR for the,' bold black)"

@@ -245,15 +249,15 @@ echo 'Optional Features:'

 	fi

 }

-if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -le 5 ] ); then

+if [ "$kernelMajor" -lt 4 ] || ([ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -le 5 ]); then

 	check_flags MEMCG_KMEM

 fi

-if [ "$kernelMajor" -lt 3 ] || ( [ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 18 ] ); then

+if [ "$kernelMajor" -lt 3 ] || ([ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 18 ]); then

 	check_flags RESOURCE_COUNTERS

 fi

-if [ "$kernelMajor" -lt 3 ] || ( [ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 13 ] ); then

+if [ "$kernelMajor" -lt 3 ] || ([ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 13 ]); then

 	netprio=NETPRIO_CGROUP

 else

 	netprio=CGROUP_NET_PRIO

@@ -270,7 +274,7 @@ flags=(

 	IP_VS_NFCT

 	IP_VS_PROTO_TCP

 	IP_VS_PROTO_UDP

- 	IP_VS_RR

+	IP_VS_RR

 )

 check_flags "${flags[@]}"

@@ -295,7 +299,7 @@ echo "  - \"$(wrap_color 'overlay' blue)\":"

 check_flags VXLAN BRIDGE_VLAN_FILTERING | sed 's/^/    /'

 echo '      Optional (for encrypted networks):'

 check_flags CRYPTO CRYPTO_AEAD CRYPTO_GCM CRYPTO_SEQIV CRYPTO_GHASH \

-            XFRM XFRM_USER XFRM_ALGO INET_ESP INET_XFRM_MODE_TRANSPORT | sed 's/^/      /'

+	XFRM XFRM_USER XFRM_ALGO INET_ESP INET_XFRM_MODE_TRANSPORT | sed 's/^/      /'

 echo "  - \"$(wrap_color 'ipvlan' blue)\":"

 check_flags IPVLAN | sed 's/^/    /'

 echo "  - \"$(wrap_color 'macvlan' blue)\":"

@@ -334,9 +338,12 @@ check_flags OVERLAY_FS | sed 's/^/    /'

 EXITCODE=0

 echo "  - \"$(wrap_color 'zfs' blue)\":"

-echo -n "    - "; check_device /dev/zfs

-echo -n "    - "; check_command zfs

-echo -n "    - "; check_command zpool

+echo -n "    - "

+check_device /dev/zfs

+echo -n "    - "

+check_command zfs

+echo -n "    - "

+check_command zpool

 [ "$EXITCODE" = 0 ] && STORAGE=0

 EXITCODE=0

@@ -345,8 +352,7 @@ EXITCODE=$CODE

 echo

-check_limit_over()

-{

+check_limit_over() {

 	if [ "$(cat "$1")" -le "$2" ]; then

 		wrap_bad "- $1" "$(cat "$1")"

 		wrap_color "    This should be set to at least $2, for example set: sysctl -w kernel/keys/root_maxkeys=1000000" bold black

@@ -16,37 +16,38 @@ set -e

 set -o pipefail

 errexit() {

-    echo "$1"

-    exit 1

+	echo "$1"

+	exit 1

 }

 BUNDLE="bundles/$(cat VERSION)"

-bundle_files(){

-    # prefer dynbinary if exists

-    for f in dockerd docker-proxy; do

-	if [ -d $BUNDLE/dynbinary-daemon ]; then

-	    echo $BUNDLE/dynbinary-daemon/$f

+bundle_files() {

+	# prefer dynbinary if exists

+	for f in dockerd docker-proxy; do

+		if [ -d $BUNDLE/dynbinary-daemon ]; then

+			echo $BUNDLE/dynbinary-daemon/$f

+		else

+			echo $BUNDLE/binary-daemon/$f

+		fi

+	done

+	for f in containerd ctr containerd-shim docker-init runc; do

+		echo $BUNDLE/binary-daemon/$f

+	done

+	if [ -d $BUNDLE/dynbinary-client ]; then

+		echo $BUNDLE/dynbinary-client/docker

 	else

-	    echo $BUNDLE/binary-daemon/$f

+		echo $BUNDLE/binary-client/docker

 	fi

-    done

-    for f in containerd ctr containerd-shim docker-init runc; do

-	echo $BUNDLE/binary-daemon/$f

-    done

-    if [ -d $BUNDLE/dynbinary-client ]; then

-	echo $BUNDLE/dynbinary-client/docker

-    else

-	echo $BUNDLE/binary-client/docker

-    fi

 }

-control_docker(){

-    m=$1; op=$2

-    # NOTE: `docker-machine ssh $m sh -c "foo bar"` does not work

-    #       (but `docker-machine ssh $m sh -c "foo\ bar"` works)

-    #       Anyway we avoid using `sh -c` here for avoiding confusion

-    cat <<EOF | docker-machine ssh $m sudo sh

+control_docker() {

+	m=$1

+	op=$2

+	# NOTE: `docker-machine ssh $m sh -c "foo bar"` does not work

+	#       (but `docker-machine ssh $m sh -c "foo\ bar"` works)

+	#       Anyway we avoid using `sh -c` here for avoiding confusion

+	cat << EOF | docker-machine ssh $m sudo sh

 if command -v systemctl > /dev/null; then

   systemctl $op docker

 elif command -v service > /dev/null; then

@@ -60,52 +61,58 @@ fi

 EOF

 }

-detect_prefix(){

-    m=$1

-    script='dirname $(dirname $(which dockerd))'

-    echo $script | docker-machine ssh $m sh

+detect_prefix() {

+	m=$1

+	script='dirname $(dirname $(which dockerd))'

+	echo $script | docker-machine ssh $m sh

 }

-install_to(){

-    m=$1; shift; files=$@

-    echo "$m: detecting docker"

-    prefix=$(detect_prefix $m)

-    echo "$m: detected docker on $prefix"

-    echo "$m: stopping docker"

-    control_docker $m stop

-    echo "$m: installing docker"

-    # NOTE: GNU tar is required because we use --transform here

-    # TODO: compression (should not be default)

-    tar ch --transform 's/.*\///' $files | docker-machine ssh $m sudo tar Cx $prefix/bin

-    echo "$m: starting docker"

-    control_docker $m start

-    echo "$m: done"

+install_to() {

+	m=$1

+	shift

+	files=$@

+	echo "$m: detecting docker"

+	prefix=$(detect_prefix $m)

+	echo "$m: detected docker on $prefix"

+	echo "$m: stopping docker"

+	control_docker $m stop

+	echo "$m: installing docker"

+	# NOTE: GNU tar is required because we use --transform here

+	# TODO: compression (should not be default)

+	tar ch --transform 's/.*\///' $files | docker-machine ssh $m sudo tar Cx $prefix/bin

+	echo "$m: starting docker"

+	control_docker $m start

+	echo "$m: done"

 }

-check_prereq(){

-    command -v docker-machine > /dev/null || errexit "docker-machine not installed"

-    ( tar --version | grep GNU > /dev/null ) || errexit "GNU tar not installed"

+check_prereq() {

+	command -v docker-machine > /dev/null || errexit "docker-machine not installed"

+	(tar --version | grep GNU > /dev/null) || errexit "GNU tar not installed"

 }

 case "$1" in

-    "install")

-	shift; machines=$@

-	check_prereq

-	files=$(bundle_files)

-	echo "Files to be installed:"

-	for f in $files; do echo $f; done

-	pids=()

-	for m in $machines; do

-	    install_to $m $files &

-	    pids+=($!)

-	done

-	status=0

-	for pid in ${pids[@]}; do

-	    wait $pid || { status=$?; echo "background process $pid failed with exit status $status"; }

-	done

-	exit $status

-	;;

-    *)

-	errexit "Usage: $0 install MACHINES"

-	;;

+	"install")

+		shift

+		machines=$@

+		check_prereq

+		files=$(bundle_files)

+		echo "Files to be installed:"

+		for f in $files; do echo $f; done

+		pids=()

+		for m in $machines; do

+			install_to $m $files &

+			pids+=($!)

+		done

+		status=0

+		for pid in ${pids[@]}; do

+			wait $pid || {

+				status=$?

+				echo "background process $pid failed with exit status $status"

+			}

+		done

+		exit $status

+		;;

+	*)

+		errexit "Usage: $0 install MACHINES"

+		;;

 esac

@@ -25,7 +25,7 @@ fi

 rootlesskit=""

 for f in docker-rootlesskit rootlesskit; do

-	if which $f >/dev/null 2>&1; then

+	if which $f > /dev/null 2>&1; then

 		rootlesskit=$f

 		break

 	fi

@@ -43,7 +43,7 @@ fi

 net=$DOCKERD_ROOTLESS_ROOTLESSKIT_NET

 mtu=$DOCKERD_ROOTLESS_ROOTLESSKIT_MTU

 if [ -z $net ]; then

-	if which slirp4netns >/dev/null 2>&1; then

+	if which slirp4netns > /dev/null 2>&1; then

 		if slirp4netns --help | grep -- --disable-host-loopback; then

 			net=slirp4netns

 			if [ -z $mtu ]; then

@@ -54,7 +54,7 @@ if [ -z $net ]; then

 		fi

 	fi

 	if [ -z $net ]; then

-		if which vpnkit >/dev/null 2>&1; then

+		if which vpnkit > /dev/null 2>&1; then

 			net=vpnkit

 		else

 			echo "Either slirp4netns (v0.3+) or vpnkit needs to be installed"

@@ -2,21 +2,21 @@

 set -e

 if ! command -v qemu-nbd &> /dev/null; then

-  echo >&2 'error: "qemu-nbd" not found!'

-  exit 1

+	echo >&2 'error: "qemu-nbd" not found!'

+	exit 1

 fi

 usage() {

-  echo "Convert disk image to docker image"

-  echo ""

-  echo "usage: $0 image-name disk-image-file [ base-image ]"

-  echo "   ie: $0 cirros:0.3.3 cirros-0.3.3-x86_64-disk.img"

-  echo "       $0 ubuntu:cloud ubuntu-14.04-server-cloudimg-amd64-disk1.img ubuntu:14.04"

+	echo "Convert disk image to docker image"

+	echo ""

+	echo "usage: $0 image-name disk-image-file [ base-image ]"

+	echo "   ie: $0 cirros:0.3.3 cirros-0.3.3-x86_64-disk.img"

+	echo "       $0 ubuntu:cloud ubuntu-14.04-server-cloudimg-amd64-disk1.img ubuntu:14.04"

 }

 if [ "$#" -lt 2 ]; then

-  usage

-  exit 1

+	usage

+	exit 1

 fi

 CURDIR=$(pwd)

@@ -24,7 +24,7 @@ CURDIR=$(pwd)

 image_name="${1%:*}"

 image_tag="${1#*:}"

 if [ "$image_tag" == "$1" ]; then

-  image_tag="latest"

+	image_tag="latest"

 fi

 disk_image_file="$2"

@@ -35,10 +35,10 @@ block_device=/dev/nbd0

 builddir=$(mktemp -d)

 cleanup() {

-  umount "$builddir/disk_image" || true

-  umount "$builddir/workdir" || true

-  qemu-nbd -d $block_device &> /dev/null || true

-  rm -rf $builddir

+	umount "$builddir/disk_image" || true

+	umount "$builddir/workdir" || true

+	qemu-nbd -d $block_device &> /dev/null || true

+	rm -rf $builddir

 }

 trap cleanup EXIT

@@ -55,18 +55,18 @@ base_image_mounts=""

 # Unpack base image

 if [ -n "$docker_base_image" ]; then

-  mkdir -p "$builddir/base"

-  docker pull "$docker_base_image"

-  docker save "$docker_base_image" | tar -xC "$builddir/base"

-

-  image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")

-  while [ -n "$image_id" ]; do

-    mkdir -p "$builddir/base/$image_id/layer"

-    tar -xf "$builddir/base/$image_id/layer.tar" -C "$builddir/base/$image_id/layer"

-

-    base_image_mounts="${base_image_mounts}:$builddir/base/$image_id/layer=ro+wh"

-    image_id=$(docker inspect -f "{{.Parent}}" "$image_id")

-  done

+	mkdir -p "$builddir/base"

+	docker pull "$docker_base_image"

+	docker save "$docker_base_image" | tar -xC "$builddir/base"

+

+	image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")

+	while [ -n "$image_id" ]; do

+		mkdir -p "$builddir/base/$image_id/layer"

+		tar -xf "$builddir/base/$image_id/layer.tar" -C "$builddir/base/$image_id/layer"

+

+		base_image_mounts="${base_image_mounts}:$builddir/base/$image_id/layer=ro+wh"

+		image_id=$(docker inspect -f "{{.Parent}}" "$image_id")

+	done

 fi

 # Mount work directory

@@ -75,20 +75,20 @@ mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/auf

 # Update files

 cd $builddir

 LC_ALL=C diff -rq disk_image workdir \

-  | sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \

-  | while read action entry; do

-      case "$action" in

-        ADD|UPDATE)

-          cp -a "disk_image$entry" "workdir$entry"

-          ;;

-        DEL)

-          rm -rf "workdir$entry"

-          ;;

-        *)

-          echo "Error: unknown diff line: $action $entry" >&2

-          ;;

-      esac

-    done

+	| sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \

+	| while read action entry; do

+		case "$action" in

+			ADD | UPDATE)

+				cp -a "disk_image$entry" "workdir$entry"

+				;;

+			DEL)

+				rm -rf "workdir$entry"

+				;;

+			*)

+				echo "Error: unknown diff line: $action $entry" >&2

+				;;

+		esac

+	done

 # Pack new image

 new_image_id="$(for i in $(seq 1 32); do printf "%02x" $(($RANDOM % 256)); done)"

@@ -96,15 +96,15 @@ mkdir -p $builddir/result/$new_image_id

 cd diff

 tar -cf $builddir/result/$new_image_id/layer.tar *

 echo "1.0" > $builddir/result/$new_image_id/VERSION

-cat > $builddir/result/$new_image_id/json <<-EOS

-{ "docker_version": "1.4.1"

-, "id": "$new_image_id"

-, "created": "$(date -u +%Y-%m-%dT%H:%M:%S.%NZ)"

+cat > $builddir/result/$new_image_id/json <<- EOS

+	{ "docker_version": "1.4.1"

+	, "id": "$new_image_id"

+	, "created": "$(date -u +%Y-%m-%dT%H:%M:%S.%NZ)"

 EOS

 if [ -n "$docker_base_image" ]; then

-  image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")

-  echo ", \"parent\": \"$image_id\"" >> $builddir/result/$new_image_id/json

+ image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")

+ echo ", \"parent\": \"$image_id\"" >> $builddir/result/$new_image_id/json

 fi

 echo "}" >> $builddir/result/$new_image_id/json

@@ -59,13 +59,13 @@ while [ $# -gt 0 ]; do

 	fi

 	IFS=','

-	ancestry=( ${ancestryJson//[\[\] \"]/} )

+	ancestry=(${ancestryJson//[\[\] \"]/})

 	unset IFS

 	if [ -s "$dir/tags-$imageFile.tmp" ]; then

 		echo -n ', ' >> "$dir/tags-$imageFile.tmp"

 	else

-		images=( "${images[@]}" "$image" )

+		images=("${images[@]}" "$image")

 	fi

 	echo -n '"'"$tag"'": "'"$imageId"'"' >> "$dir/tags-$imageFile.tmp"

@@ -49,11 +49,15 @@ authService='registry.docker.io'

 # https://github.com/moby/moby/issues/33700

 fetch_blob() {

-	local token="$1"; shift

-	local image="$1"; shift

-	local digest="$1"; shift

-	local targetFile="$1"; shift

-	local curlArgs=( "$@" )

+	local token="$1"

+	shift

+	local image="$1"

+	shift

+	local digest="$1"

+	shift

+	local targetFile="$1"

+	shift

+	local curlArgs=("$@")

 	local curlHeaders="$(

 		curl -S "${curlArgs[@]}" \

@@ -63,7 +67,7 @@ fetch_blob() {

 			-D-

 	)"

 	curlHeaders="$(echo "$curlHeaders" | tr -d '\r')"

-	if grep -qE "^HTTP/[0-9].[0-9] 3" <<<"$curlHeaders"; then

+	if grep -qE "^HTTP/[0-9].[0-9] 3" <<< "$curlHeaders"; then

 		rm -f "$targetFile"

 		local blobRedirect="$(echo "$curlHeaders" | awk -F ': ' 'tolower($1) == "location" { print $2; exit }')"

@@ -81,7 +85,8 @@ fetch_blob() {

 # handle 'application/vnd.docker.distribution.manifest.v2+json' manifest

 handle_single_manifest_v2() {

-	local manifestJson="$1"; shift

+	local manifestJson="$1"

+	shift

 	local configDigest="$(echo "$manifestJson" | jq --raw-output '.config.digest')"

 	local imageId="${configDigest#*:}" # strip off "sha256:"

@@ -91,7 +96,7 @@ handle_single_manifest_v2() {

 	local layersFs="$(echo "$manifestJson" | jq --raw-output --compact-output '.layers[]')"

 	local IFS="$newlineIFS"

-	local layers=( $layersFs )

+	local layers=($layersFs)

 	unset IFS

 	echo "Downloading '$imageIdentifier' (${#layers[@]} layers)..."

@@ -116,7 +121,7 @@ handle_single_manifest_v2() {

 			local parentJson="$(printf ', parent: "%s"' "$parentId")"

 			local addJson="$(printf '{ id: "%s"%s }' "$layerId" "${parentId:+$parentJson}")"

 			# this starter JSON is taken directly from Docker's own "docker save" output for unimportant layers

-			jq "$addJson + ." > "$dir/$layerId/json" <<-'EOJSON'

+			jq "$addJson + ." > "$dir/$layerId/json" <<- 'EOJSON'

 				{

 					"created": "0001-01-01T00:00:00Z",

 					"container_config": {

@@ -145,7 +150,7 @@ handle_single_manifest_v2() {

 		case "$layerMediaType" in

 			application/vnd.docker.image.rootfs.diff.tar.gzip)

 				local layerTar="$layerId/layer.tar"

-				layerFiles=( "${layerFiles[@]}" "$layerTar" )

+				layerFiles=("${layerFiles[@]}" "$layerTar")

 				# TODO figure out why "-C -" doesn't work here

 				# "curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume."

 				# "HTTP/1.1 416 Requested Range Not Satisfiable"

@@ -179,7 +184,7 @@ handle_single_manifest_v2() {

 			Layers: '"$(echo '[]' | jq --raw-output ".$(for layerFile in "${layerFiles[@]}"; do echo " + [ \"$layerFile\" ]"; done)")"'

 		}'

 	)"

-	manifestJsonEntries=( "${manifestJsonEntries[@]}" "$manifestJsonEntry" )

+	manifestJsonEntries=("${manifestJsonEntries[@]}" "$manifestJsonEntry")

 }

 while [ $# -gt 0 ]; do

@@ -227,7 +232,7 @@ while [ $# -gt 0 ]; do

 				application/vnd.docker.distribution.manifest.list.v2+json)

 					layersFs="$(echo "$manifestJson" | jq --raw-output --compact-output '.manifests[]')"

 					IFS="$newlineIFS"

-					layers=( $layersFs )

+					layers=($layersFs)

 					unset IFS

 					found=""

@@ -273,7 +278,7 @@ while [ $# -gt 0 ]; do

 			layersFs="$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum')"

 			IFS="$newlineIFS"

-			layers=( $layersFs )

+			layers=($layersFs)

 			unset IFS

 			history="$(echo "$manifestJson" | jq '.history | [.[] | .v1Compatibility]')"

@@ -314,7 +319,7 @@ while [ $# -gt 0 ]; do

 	if [ -s "$dir/tags-$imageFile.tmp" ]; then

 		echo -n ', ' >> "$dir/tags-$imageFile.tmp"

 	else

-		images=( "${images[@]}" "$image" )

+		images=("${images[@]}" "$image")

 	fi

 	echo -n '"'"$tag"'": "'"$imageId"'"' >> "$dir/tags-$imageFile.tmp"

 done

@@ -8,9 +8,9 @@

 #  $> ./generate_aliases <mailmap_file> > aliases

 #

-cat $1 | \

-    grep -v '^#' | \

-    sed 's/^[^<]*<\([^>]*\)>/\1/' | \

-    grep '<.*>' | sed -e 's/[<>]/ /g' | \

-    awk '{if ($3 != "") { print $3" "$1 } else {print $2" "$1}}' | \

-    sort | uniq

+cat $1 \

+	| grep -v '^#' \

+	| sed 's/^[^<]*<\([^>]*\)>/\1/' \

+	| grep '<.*>' | sed -e 's/[<>]/ /g' \

+	| awk '{if ($3 != "") { print $3" "$1 } else {print $2" "$1}}' \

+	| sort | uniq

@@ -22,7 +22,7 @@ start_pre() {

 }

 reload() {

-        ebegin "Reloading ${RC_SVCNAME}"

-        start-stop-daemon --signal HUP --pidfile "${pidfile}"

-        eend $? "Failed to stop ${RC_SVCNAME}"

+	ebegin "Reloading ${RC_SVCNAME}"

+	start-stop-daemon --signal HUP --pidfile "${pidfile}"

+	eend $? "Failed to stop ${RC_SVCNAME}"

 }

@@ -46,7 +46,7 @@ fi

 check_init() {

 	# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly)

-	if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then

+	if [ -x /sbin/initctl ] && /sbin/initctl version 2> /dev/null | grep -q upstart; then

 		log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1"

 		exit 1

 	fi

@@ -85,7 +85,7 @@ cgroupfs_mount() {

 case "$1" in

 	start)

 		check_init

-		

+

 		fail_unless_root

 		cgroupfs_mount

@@ -110,9 +110,9 @@ case "$1" in

 			--pidfile "$DOCKER_SSD_PIDFILE" \

 			--make-pidfile \

 			-- \

-				-p "$DOCKER_PIDFILE" \

-				$DOCKER_OPTS \

-					>> "$DOCKER_LOGFILE" 2>&1

+			-p "$DOCKER_PIDFILE" \

+			$DOCKER_OPTS \

+			>> "$DOCKER_LOGFILE" 2>&1

 		log_end_msg $?

 		;;

@@ -131,7 +131,7 @@ case "$1" in

 	restart)

 		check_init

 		fail_unless_root

-		docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null`

+		docker_pid=$(cat "$DOCKER_SSD_PIDFILE" 2> /dev/null)

 		[ -n "$docker_pid" ] \

 			&& ps -p $docker_pid > /dev/null 2>&1 \

 			&& $0 stop

@@ -109,10 +109,9 @@ rh_status() {

 }

 rh_status_q() {

-	rh_status >/dev/null 2>&1

+	rh_status > /dev/null 2>&1

 }

-

 check_for_cleanup() {

 	if [ -f ${pidfile} ]; then

 		/bin/ps -fp $(cat ${pidfile}) > /dev/null || rm ${pidfile}

@@ -141,13 +140,14 @@ case "$1" in

 	status)

 		rh_status

 		;;

-	condrestart|try-restart)

+	condrestart | try-restart)

 		rh_status_q || exit 0

 		restart

 		;;

 	*)

 		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"

 		exit 2

+		;;

 esac

 exit $?

@@ -20,26 +20,26 @@ DATABASE_KEY="$DATABASE/com.docker.driver.amd64-linux/bundle"

 [ -d "$DATABASE" ] || errexit "Docker for Mac must be installed for this script"

 case "$1" in

-"install")

-	[ -d "$BUNDLE" ] || errexit "cannot find bundle $BUNDLE"

-	[ -e "$CLIENT_PATH" ] || errexit "you need to run make cross first"

-	[ -e "$BUNDLE/binary-daemon/dockerd" ] || errexit "you need to build binaries first"

-	[ -f "$BUNDLE/binary-client/docker" ] || errexit "you need to build binaries first"

-	git -C "$DATABASE" reset --hard >/dev/null

-	echo "$BUNDLE_PATH" > "$DATABASE_KEY"

-	git -C "$DATABASE" add "$DATABASE_KEY"

-	git -C "$DATABASE" commit -m "update bundle to $BUNDLE_PATH"

-	rm -f /usr/local/bin/docker

-	cp "$CLIENT_PATH" /usr/local/bin

-	echo "Bundle installed. Restart Docker to use. To uninstall, reset Docker to factory defaults."

-	;;

-"undo")

-	git -C "$DATABASE" reset --hard >/dev/null

-	[ -f "$DATABASE_KEY" ] || errexit "bundle not set"

-	git -C "$DATABASE" rm "$DATABASE_KEY"

-	git -C "$DATABASE" commit -m "remove bundle"

-	rm -f /usr/local/bin/docker

-	ln -s "$HOME/Library/Group Containers/group.com.docker/bin/docker" /usr/local/bin

-	echo "Bundle removed. Using dev versions may cause issues, a reset to factory defaults is recommended."

-	;;

+	"install")

+		[ -d "$BUNDLE" ] || errexit "cannot find bundle $BUNDLE"

+		[ -e "$CLIENT_PATH" ] || errexit "you need to run make cross first"

+		[ -e "$BUNDLE/binary-daemon/dockerd" ] || errexit "you need to build binaries first"

+		[ -f "$BUNDLE/binary-client/docker" ] || errexit "you need to build binaries first"

+		git -C "$DATABASE" reset --hard > /dev/null

+		echo "$BUNDLE_PATH" > "$DATABASE_KEY"

+		git -C "$DATABASE" add "$DATABASE_KEY"

+		git -C "$DATABASE" commit -m "update bundle to $BUNDLE_PATH"

+		rm -f /usr/local/bin/docker

+		cp "$CLIENT_PATH" /usr/local/bin

+		echo "Bundle installed. Restart Docker to use. To uninstall, reset Docker to factory defaults."

+		;;

+	"undo")

+		git -C "$DATABASE" reset --hard > /dev/null

+		[ -f "$DATABASE_KEY" ] || errexit "bundle not set"

+		git -C "$DATABASE" rm "$DATABASE_KEY"

+		git -C "$DATABASE" commit -m "remove bundle"

+		rm -f /usr/local/bin/docker

+		ln -s "$HOME/Library/Group Containers/group.com.docker/bin/docker" /usr/local/bin

+		echo "Bundle removed. Using dev versions may cause issues, a reset to factory defaults is recommended."

+		;;

 esac

@@ -19,13 +19,13 @@ tmp() {

 }

 apkv() {

-	curl -sSL $MAINREPO/$ARCH/APKINDEX.tar.gz | tar -Oxz |

-		grep --text '^P:apk-tools-static$' -A1 | tail -n1 | cut -d: -f2

+	curl -sSL $MAINREPO/$ARCH/APKINDEX.tar.gz | tar -Oxz \

+		| grep --text '^P:apk-tools-static$' -A1 | tail -n1 | cut -d: -f2

 }

 getapk() {

-	curl -sSL $MAINREPO/$ARCH/apk-tools-static-$(apkv).apk |

-		tar -xz -C $TMP sbin/apk.static

+	curl -sSL $MAINREPO/$ARCH/apk-tools-static-$(apkv).apk \

+		| tar -xz -C $TMP sbin/apk.static

 }

 mkbase() {

@@ -7,12 +7,12 @@ set -e

 # reset umask to default

 umask 022

-hash pacstrap &>/dev/null || {

+hash pacstrap &> /dev/null || {

 	echo "Could not find pacstrap. Run pacman -S arch-install-scripts"

 	exit 1

 }

-hash expect &>/dev/null || {

+hash expect &> /dev/null || {

 	echo "Could not find expect. Run pacman -S expect"

 	exit 1

 }

@@ -64,7 +64,7 @@ PKGIGNORE=(

 PKGREMOVE=(

 	gawk

-	haveged 

+	haveged

 	less

 	linux-libre

 	linux-libre-firmware

@@ -79,7 +79,7 @@ PKGREMOVE="${PKGREMOVE[*]}"

 arch="$(uname -m)"

 case "$arch" in

 	armv*)

-		if pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then

+		if pacman -Q archlinuxarm-keyring > /dev/null 2>&1; then

 			pacman-key --init

 			pacman-key --populate archlinuxarm

 		else

@@ -107,7 +107,7 @@ esac

 export PACMAN_MIRRORLIST

-expect <<EOF

+expect << EOF

 	set send_slow {1 .1}

 	proc send {ignore arg} {

 		sleep .1

@@ -5,9 +5,9 @@

 set -e

-die () {

-    echo >&2 "$@"

-    exit 1

+die() {

+	echo >&2 "$@"

+	exit 1

 }

 [ "$#" -eq 1 ] || die "1 argument(s) required, $# provided. Usage: ./mkimage-crux.sh /path/to/iso"

@@ -33,15 +33,15 @@ export PATH="$TMP/usr/bin:$PATH"

 mkdir -p $ROOTFS/var/lib/pkg

 touch $ROOTFS/var/lib/pkg/db

 for pkg in $CRUX/crux/core/*; do

-    pkgadd -r $ROOTFS $pkg

+	pkgadd -r $ROOTFS $pkg

 done

 # Remove agetty and inittab config

 if (grep agetty ${ROOTFS}/etc/inittab 2>&1 > /dev/null); then

-    echo "Removing agetty from /etc/inittab ..."

-    chroot ${ROOTFS} sed -i -e "/agetty/d" /etc/inittab

-    chroot ${ROOTFS} sed -i -e "/shutdown/d" /etc/inittab

-    chroot ${ROOTFS} sed -i -e "/^$/N;/^\n$/d" /etc/inittab

+	echo "Removing agetty from /etc/inittab ..."

+	chroot ${ROOTFS} sed -i -e "/agetty/d" /etc/inittab

+	chroot ${ROOTFS} sed -i -e "/shutdown/d" /etc/inittab

+	chroot ${ROOTFS} sed -i -e "/^$/N;/^\n$/d" /etc/inittab

 fi

 # Remove kernel source

@@ -9,7 +9,7 @@

 set -e

 usage() {

-    cat <<EOOPTS

+	cat << EOOPTS

 $(basename $0) [OPTIONS] <name>

 OPTIONS:

   -p "<packages>"  The list of packages to install in the container.

@@ -21,7 +21,7 @@ OPTIONS:

   -t <tag>         Specify Tag information.

                    default is reffered at /etc/{redhat,system}-release

 EOOPTS

-    exit 1

+	exit 1

 }

 # option defaults

@@ -35,38 +35,38 @@ install_groups=()

 install_packages=()