summaryrefslogtreecommitdiff
path: root/apps/installer/includes/os_configs
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2018-01-28 19:50:01 +0100
committerGitHub <noreply@github.com>2018-01-28 19:50:01 +0100
commit19bf454e5f0a5c6822ceefd199f9c17af7d02e6b (patch)
tree134ccec2957fdf7cf7f354973303cd810ee2e231 /apps/installer/includes/os_configs
parentcdbfac743d9f4510f9c6cf55316e73f5a4d43e40 (diff)
Fixed travis compilation (#769)
Diffstat (limited to 'apps/installer/includes/os_configs')
-rw-r--r--apps/installer/includes/os_configs/ubuntu.sh21
1 files changed, 18 insertions, 3 deletions
diff --git a/apps/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh
index 6ed4117ed6..4881781561 100644
--- a/apps/installer/includes/os_configs/ubuntu.sh
+++ b/apps/installer/includes/os_configs/ubuntu.sh
@@ -1,5 +1,20 @@
+UBUNTU_VERSION=$(lsb_release -sr);
-sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \
-libssl-dev=1.0.2g-1ubuntu4.8 libbz2-dev libreadline-dev libncurses-dev \
-mysql-server libace-6.* libace-dev
+if [[ $TRAVIS && $CONTINUOUS_INTEGRATION ]]; then
+ sudo apt-get -y install build-essential libtool make cmake cmake-data clang openssl libgoogle-perftools-dev \
+ libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev
+else
+ case $UBUNTU_VERSION in
+ "14.04")
+ sudo apt-get -y install build-essential libtool make cmake cmake-data gcc g++ clang openssl libgoogle-perftools-dev \
+ libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev mysql-server libncurses-dev
+ ;;
+ *)
+ sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \
+ libssl-dev=1.0.2g-1ubuntu4.8 libbz2-dev libreadline-dev libncurses-dev \
+ mysql-server libace-6.* libace-dev
+ ;;
+ esac
+fi
+