split out installer for travis from the original ubuntu one
This commit is contained in:
parent
baf6b2a355
commit
9f672aa0a9
3 changed files with 19 additions and 13 deletions
|
@ -1,2 +1,2 @@
|
|||
language: bash
|
||||
script: ./ubuntu/configure_fresh_system
|
||||
script: ./travis/configure_fresh_system
|
||||
|
|
14
travis/configure_fresh_system
Executable file
14
travis/configure_fresh_system
Executable 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
|
||||
|
|
@ -1,21 +1,13 @@
|
|||
#!/bin/bash
|
||||
# detect if building inside a CI system, like Travis
|
||||
if [ -z ${IN_CI+x} ]; then
|
||||
echo "choosing the more interactive installation method"
|
||||
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
|
||||
|
||||
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"
|
||||
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"
|
||||
eval ${INSTALL_COMMAND}
|
||||
|
|
Loading…
Reference in a new issue