From 41ef3b1d222cf44f8fffe9e98f7d134796e090ad Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Sun, 19 Aug 2018 15:25:01 +0300
Subject: [PATCH] image_builder: /dev/null

---
 image_builder/scripts/init_image.sh       |  4 ++--
 image_builder/scripts/ros_install.sh      | 16 ++++++----------
 image_builder/scripts/software_install.sh |  5 +++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/image_builder/scripts/init_image.sh b/image_builder/scripts/init_image.sh
index f8588345..0c03b477 100755
--- a/image_builder/scripts/init_image.sh
+++ b/image_builder/scripts/init_image.sh
@@ -16,9 +16,9 @@ set -e
 echo -e "\033[0;31m\033[1m$(date) | #1 apt cache update\033[0m\033[0m"
 
 # Clean repostory cache
-apt-get clean
+apt-get clean -qq > /dev/null
 # Update repository cache
-apt-get update
+apt-get update -qq > /dev/null
 # && apt upgrade -y
 
 echo -e "\033[0;31m\033[1m$(date) | #2 Write clever information\033[0m\033[0m"
diff --git a/image_builder/scripts/ros_install.sh b/image_builder/scripts/ros_install.sh
index e161af0a..2d0519ca 100755
--- a/image_builder/scripts/ros_install.sh
+++ b/image_builder/scripts/ros_install.sh
@@ -12,29 +12,25 @@ echo -e "\033[0;31m\033[1m$(date) | Installing ROS\033[0m\033[0m"
 
 echo -e "\033[0;31m\033[1m$(date) | #1 Installing dirmngr & add key to apt-key\033[0m\033[0m"
 
-# Install a tool that apt-key uses to add ROS repository key
-# http://wpblogger.su/tags/apt/
-apt-get install --no-install-recommends -y dirmngr=2.1.18-8~deb9u2
-# setup keys
+apt-get install --no-install-recommends -y -dd dirmngr=2.1.18-8~deb9u2 > /dev/null
 apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
 
-# setup sources.list
 echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list
 
 echo -e "\033[0;31m\033[1m$(date) | #2 apt update && apt upgrade\033[0m\033[0m"
 
-# install bootstrap tools
-apt-get update
+apt-get update -qq > /dev/null
 # && apt upgrade -y
 
 echo -e "\033[0;31m\033[1m$(date) | #3 Installing wget, unzip, python-rosdep, python-rosinstall-generator, python-wstool, python-rosinstall, build-essential, cmake\033[0m\033[0m"
 
-apt-get install --no-install-recommends -y \
+apt-get install --no-install-recommends -y -qq \
   python-rosdep=0.12.2-1 \
   python-rosinstall-generator=0.1.14-1 \
   python-wstool=0.1.17-1 \
   python-rosinstall=0.7.8-1 \
-  build-essential=12.3
+  build-essential=12.3 \
+  > /dev/null
 
 echo -e "\033[0;31m\033[1m$(date) | #4 rosdep init && rosdep update\033[0m\033[0m"
 
@@ -161,7 +157,7 @@ EOF
 # Restore original sources.list
 #mv /var/sources.list.bak /etc/apt/sources.list
 # Clean apt cache
-apt-get clean
+apt-get clean -qq > /dev/null
 # Remove local mirror repository key
 #apt-key del COEX-MIRROR
 
diff --git a/image_builder/scripts/software_install.sh b/image_builder/scripts/software_install.sh
index 3a4bb793..2381798a 100755
--- a/image_builder/scripts/software_install.sh
+++ b/image_builder/scripts/software_install.sh
@@ -9,7 +9,7 @@ set -e
 echo -e "\033[0;31m\033[1m$(date) | #1 Software installing\033[0m\033[0m"
 
 # TODO: Use dnsmasq instead of isc-dhcp-server
-apt-get install --no-install-recommends -y \
+apt-get install --no-install-recommends -y  -qq \
   unzip=6.0-21 \
   zip=3.0-11 \
   ipython=5.1.0-3 \
@@ -27,7 +27,8 @@ apt-get install --no-install-recommends -y \
   python3-pip=9.0.1-2+rpt2 \
   libjpeg8-dev=8d1-2 \
   tcpdump \
-  libpoco-dev=1.7.6+dfsg1-5+deb9u1
+  libpoco-dev=1.7.6+dfsg1-5+deb9u1 \
+  > /dev/null
   
 echo -e "\033[0;31m\033[1m$(date) | #2 Adding mjpg-streamer at /home/pi\033[0m\033[0m"
 # https://github.com/jacksonliam/mjpg-streamer