kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Removed extra whitespace

Browse source 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
This commit is contained in:
James Turnbull 2014-04-08 11:59:36 -07:00
parent fa5223dab5
commit a2aa902ec1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hack/install.sh
View file

@ -103,7 +103,7 @@ case "$lsb_dist" in
Ubuntu|Debian) Ubuntu|Debian)
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
did_apt_get_update= did_apt_get_update=
apt_get_update() { apt_get_update() {
if [ -z "$did_apt_get_update" ]; then if [ -z "$did_apt_get_update" ]; then
@ -111,21 +111,21 @@ case "$lsb_dist" in
did_apt_get_update=1 did_apt_get_update=1
fi fi
} }
# aufs is preferred over devicemapper; try to ensure the driver is available. # aufs is preferred over devicemapper; try to ensure the driver is available.
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
kern_extras="linux-image-extra-$(uname -r)" kern_extras="linux-image-extra-$(uname -r)"
apt_get_update apt_get_update
( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true ( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)' echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!' echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!'
( set -x; sleep 10 ) ( set -x; sleep 10 )
fi fi
fi fi
if [ ! -e /usr/lib/apt/methods/https ]; then if [ ! -e /usr/lib/apt/methods/https ]; then
apt_get_update apt_get_update
( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https' )
@ -165,7 +165,7 @@ case "$lsb_dist" in
echo echo
exit 0 exit 0
;; ;;
Gentoo) Gentoo)
if [ "$url" = "https://test.docker.io/" ]; then if [ "$url" = "https://test.docker.io/" ]; then
echo >&2 echo >&2
@ -180,7 +180,7 @@ case "$lsb_dist" in
echo >&2 echo >&2
exit 1 exit 1
fi fi
( (
set -x set -x
$sh_c 'sleep 3; emerge app-emulation/docker' $sh_c 'sleep 3; emerge app-emulation/docker'