Adjust README.install-20.04.
This commit is contained in:
@@ -327,7 +327,6 @@ echo ""
|
||||
|
||||
_error=false
|
||||
: > $log_file
|
||||
blank_line
|
||||
echononl "Check if needed packages are installed.."
|
||||
for _pkg in $NEEDED_DEBIAN_PACKAGES ; do
|
||||
if aptitude search "$_pkg" | grep " $_pkg " | grep -e "^i" >> "$log_file" 2>&1 ; then
|
||||
@@ -488,8 +487,12 @@ else
|
||||
|
||||
fi
|
||||
|
||||
blank_line
|
||||
|
||||
info "The settings in the \033[1etc/default/locale\033[m file are correct."
|
||||
|
||||
blank_line
|
||||
|
||||
|
||||
echononl "Set system environment to 'en_US.UTF-8'.."
|
||||
if $(systemctl show-environment | grep -Eq "LANG=\"?en_US.UTF-8\"?") ; then
|
||||
@@ -514,8 +517,6 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
blank_line
|
||||
|
||||
|
||||
|
||||
# ---
|
||||
@@ -524,14 +525,14 @@ blank_line
|
||||
|
||||
echo ""
|
||||
echo -e " \033[1m---\033[m"
|
||||
echo -e " \033[32m\Install latest version of docker033[m"
|
||||
echo -e " \033[32mInstall latest version of docker\033[m"
|
||||
echo -e " \033[1m---\033[m"
|
||||
echo ""
|
||||
|
||||
:> "$log_file"
|
||||
if ! $(grep -Eq "^\s*deb\s+.*https://download.docker.com/linux/ubuntu\s+$DIST_CODENAME\s+stable" /etc/apt/sources.list) \
|
||||
&& ! $(grep -r -Eq "^\s*deb\s+.*https://download.docker.com/linux/ubuntu\s+$DIST_CODENAME\s+stable" /etc/apt/sources.list.d/*)
|
||||
then
|
||||
then
|
||||
echononl "Add GPG key for official Docker repository.."
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg 2> "$log_file" | apt-key add - >> "$log_file" 2>&1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user