From e29f1a302ffd43175caf77d5cb6a031ad6333703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 10 Feb 2017 09:14:03 +0100
Subject: [PATCH] Changed 50unattended-upgrades.ucf-dist existence check.

---
 3.New_server_deployment/4.APT_upgrade/0_setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/3.New_server_deployment/4.APT_upgrade/0_setup.sh b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
index 793ab100..977382ab 100755
--- a/3.New_server_deployment/4.APT_upgrade/0_setup.sh
+++ b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
@@ -2,13 +2,13 @@
 source /root/envsetup/global-conf.sh
 
 # move 50unattended-upgrades conf if any
-if ( ls /etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist 2>&1 >/dev/null ); then
+if [ -f /etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist ]; then
 	mv /etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist /etc/apt/apt.conf.d/50unattended-upgrades
 fi
 
 # update sources.list
 rm -f /etc/apt/sources.list~
-echo "Updating sources.list file."
+echo "Updating /etc/apt/sources.list file."
 cp sources16.list /etc/apt/sources.list
 if ( rgrep '14.04' /etc/lsb-release >/dev/null ); then
 	sed -i 's@xenial@trusty@' /etc/apt/sources.list
@@ -17,7 +17,7 @@ fi
 # modify sources.list to use ubicast cache
 if ( ! test -z ${APT_CACHE_HOST} ); then
 	if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
-		echo "Updating sources.list to use cache ${APT_CACHE_HOST}."
+		echo "Updating /etc/apt/sources.list to use cache ${APT_CACHE_HOST}."
 		sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
 	fi
 fi
-- 
GitLab