From 368b42533f93d3a0284939e2262874703f74e347 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Sat, 3 Jan 2015 23:36:05 +0100
Subject: [PATCH] no asking for confirmation while upgrading ubuntu,
 dist-upgrade used, as we're using apt, not aptitude in the early stages, fix
 for shell changer

---
 install_common.sh | 4 ++--
 install_ubuntu.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install_common.sh b/install_common.sh
index f3be1f26..a4f1a706 100755
--- a/install_common.sh
+++ b/install_common.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #zsh
-sudo chsh -s `which zsh` $USER 
+sudo true
+chsh -s `which zsh` $USER 
 
 #submodules
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -9,7 +10,6 @@ cd $DIR
 git submodule init
 git submodule update --recursive
 
-
 #symbolic links
 ln -vfs "$DIR/.vim" ~/.
 ln -vfs "$DIR/.vimrc" ~/.
diff --git a/install_ubuntu.sh b/install_ubuntu.sh
index 4e3279cc..9c491ecc 100755
--- a/install_ubuntu.sh
+++ b/install_ubuntu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 sudo apt-get update
-sudo apt-get full-upgrade
-sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar
+sudo apt-get dist-upgrade -y
+sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 $DIR/install_common.sh