0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix install script to handle debian 8.1 apt repo string

Browse source 
Fix #14911

Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2015-07-26 20:06:33 +02:00
parent afac39d308
commit 98f15cae89
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
hack/install.sh
View file

@ -51,6 +51,19 @@ echo_docker_as_nonroot() {
EOF
}
get_debian_dist_version() {
dist_version=''
case "$@" in
8)
dist_version="jessie"
;;
7)
dist_version="wheezy"
;;
esac
echo "$dist_version"
}
do_install() {
case "$(uname -m)" in
*64)
@ -124,19 +137,32 @@ do_install() {
if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")"
if [ -z "$dist_version" ]; then
dist_version="$(. /etc/lsb-release && echo "$DISTRIB_RELEASE")"
case "$lsb_dist" in
"Debian")
dist_version="$(get_debian_dist_version "$dist_version")"
;;
"Ubuntu")
case "$dist_version" in
"15.04")
dist_version="vivid"
;;
"14.04")
dist_version="trusty"
;;
"12.04")
dist_version="precise"
;;
esac
;;
esac
fi
fi
if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
lsb_dist='debian'
dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
case "$dist_version" in
8)
dist_version="jessie"
;;
7)
dist_version="wheezy"
;;
esac
dist_version="$(get_debian_dist_version "$dist_version")"
fi
if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
lsb_dist='fedora'