split out installer for travis from the original ubuntu one

This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-07-19 11:06:13 +02:00
parent baf6b2a355
commit 9f672aa0a9
3 changed files with 19 additions and 13 deletions

View file

@ -1,2 +1,2 @@
language: bash language: bash
script: ./ubuntu/configure_fresh_system script: ./travis/configure_fresh_system

14
travis/configure_fresh_system Executable file
View file

@ -0,0 +1,14 @@
#!/bin/bash
# detect if building inside a CI system, like Travis
echo "choosing totally noninteractive installation method"
COMMAND_PREFIX="DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confnew\"";
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"
eval ${INSTALL_COMMAND}
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system

View file

@ -1,21 +1,13 @@
#!/bin/bash #!/bin/bash
# detect if building inside a CI system, like Travis # detect if building inside a CI system, like Travis
if [ -z ${IN_CI+x} ]; then
echo "choosing the more interactive installation method" echo "choosing the more interactive installation method"
COMMAND_PREFIX="apt-get -y"; COMMAND_PREFIX="apt-get -y";
else
echo "choosing totally noninteractive installation method"
COMMAND_PREFIX="DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confnew\"";
fi
set -e set -e
sudo apt-get update sudo apt-get update
if [ -z ${IN_CI+x} ]; then
echo "upgrading whole system, as not in CI"
UPGRADE_COMMAND="sudo $COMMAND_PREFIX dist-upgrade" UPGRADE_COMMAND="sudo $COMMAND_PREFIX dist-upgrade"
eval ${UPGRADE_COMMAND} eval ${UPGRADE_COMMAND}
fi
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 aircrack-ng macchanger" 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 aircrack-ng macchanger"
eval ${INSTALL_COMMAND} eval ${INSTALL_COMMAND}