tools: make sure all systema updates go through

tizonia · May 4, 2016 · 2dcdfcd · 2dcdfcd
1 parent 81387ae
commit 2dcdfcd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tools/tizonia-dpkg-build b/tools/tizonia-dpkg-build
@@ -436,7 +436,7 @@ function do_tizonia_deps {
             echo deb http://apt.mopidy.com/ stable main contrib non-free | sudo tee -a /etc/apt/sources.list
             echo deb-src http://apt.mopidy.com/ stable main contrib non-free | sudo tee -a /etc/apt/sources.list
             sudo apt-get update
-            sudo apt-get install libspotify12 libspotify-dev -q -y
+            sudo apt-get install libspotify12 libspotify-dev -qq --force-yes
             pretty_print "$GRN" "[libspotify] : installed."
         fi
     fi
@@ -448,7 +448,7 @@ function do_tizonia_deps {
             pretty_print "$GRN" "[$pkg] : $result."
         else
             pretty_print "$BLU" "[$pkg] : installing."
-            sudo apt-get install -q -y "$pkg" #> /dev/null
+            sudo apt-get install -qq --force-yes "$pkg" #> /dev/null
             pretty_print "$GRN" "[$pkg] : installed."
         fi
     done
@@ -517,7 +517,7 @@ function do_all_deps {
             pretty_print "$GRN" "[$pkg] : $result."
         else
             pretty_print "$BLU" "[$pkg] : installing."
-            sudo apt-get install -q -y "$pkg" #> /dev/null
+            sudo apt-get install -qq --force-yes "$pkg" #> /dev/null
             pretty_print "$GRN" "[$pkg] : installed."
         fi
     done
@@ -982,7 +982,7 @@ function do_uninstall_project_debs {
 ##################################################################
 function do_uninstall_all_debs {
     local exit_status=0
-    sudo apt-get remove --purge tizonia-all -q -y && sudo apt-get autoremove -q -y
+    sudo apt-get remove --purge tizonia-all -qq --force-yes && sudo apt-get autoremove -qq --force-yes
     dpkg -l | grep -E 'ii\s*(libtiz|tiz|python-tiz)' | awk '{ print $2 }' | xargs sudo apt-get remove --purge -qq
     return "$exit_status"
 }

diff --git a/tools/tizonia-qemu-debootstrap-env b/tools/tizonia-qemu-debootstrap-env
@@ -294,7 +294,7 @@ function check_dependency {
     local result=$(dpkg-query -W -f='${Status} ${Version}\n' "$1" 2> /dev/null | cut -d ' ' -f3)
     if [[ "$result" != "installed" ]]; then
         pretty_print "$RED" "[NOK] $1 not installed. Installing now."
-        $cmd_sudo apt-get -y install "$1"
+        $cmd_sudo apt-get -y --force-yes install "$1"
     else
         pretty_print "$GRN" "[ OK] $1 installed."
     fi
@@ -375,8 +375,8 @@ EOF
 
     print_banner "[$DISTRO-$RELEASE-$ARCH] Installing additional packages" "$GRN"
     run_chroot apt-get update
-    run_chroot apt-get upgrade -qq
-    run_chroot apt-get install -qq sudo mercurial wget python python-setuptools apt-utils dpkg-dev
+    run_chroot apt-get upgrade -qq --force-yes
+    run_chroot apt-get install -qq --force-yes sudo mercurial wget python python-setuptools apt-utils dpkg-dev
     echo
     pretty_print "$BLU" "Done installing additional packages."
 }
@@ -430,7 +430,7 @@ function bootstrap_environment {
 
     print_banner "[$DISTRO-$RELEASE-$ARCH] Updating apt cache" "$GRN"
     run_chroot apt-get update
-    run_chroot apt-get upgrade -qq
+    run_chroot apt-get upgrade -qq --force-yes
 
     print_banner "[$DISTRO-$RELEASE-$ARCH] Installing Tizonia's dependencies" "$GRN"
     run_chroot /bin/bash -v -c 'source /root/.profile; /root/work/tizonia/tools/tizonia-dpkg-build --alldeps'