dont change shell on travis

This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-07-19 11:23:35 +02:00
parent 9f672aa0a9
commit cf283ef6a1
2 changed files with 8 additions and 3 deletions

View file

@ -3,8 +3,13 @@
set -e
echo
echo "configuring settings common among OSes"
sudo true
#zsh
chsh -s `which zsh` $USER
if [[ -z $DONT_CHANGE_SHELL ]]; then
echo "changing shell to zsh"
chsh -s `which zsh` $USER
fi
#submodules
DIR=`realpath $DIR`

View file

@ -5,10 +5,10 @@ COMMAND_PREFIX="DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::=\"-
sudo apt-get update
INSTALL_COMMAND="sudo $COMMAND_PREFIX 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 thunderbird mercurial kdiff3 gnupg2 python3-setuptools"
INSTALL_COMMAND="sudo $COMMAND_PREFIX install meld whois zsh tmux vim atop aria2 curl pv gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird mercurial kdiff3 gnupg2 python3-setuptools"
eval ${INSTALL_COMMAND}
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system
DONT_CHANGE_SHELL=TRUE DIR="$DIR" $DIR/common/configure_fresh_system