From e8eb03b3e0799f5de76cdabd54908750e3905496 Mon Sep 17 00:00:00 2001 From: Andrey Mironov Date: Fri, 11 Dec 2015 12:14:09 +0300 Subject: [PATCH] check for MySQL and MongoDB client application presence [#METR-18946] --- .gitignore | 2 +- run.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 36a7559c40c..105a72594c8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,4 +57,4 @@ docs/_build/ target/ *-preprocessed.xml -.idea/ \ No newline at end of file +.idea/ diff --git a/run.sh b/run.sh index b3209467c3c..7413165b260 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ -#/bin/sh +#!/bin/sh # MySQL -if [ -z $(which mysqld) ]; then +if [ -z $(which mysqld) ] || [ -z $(which mysqld) ]; then echo 'Installing MySQL' sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password ' sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password ' @@ -44,7 +44,7 @@ else fi # MongoDB -if [ -z $(which mongod) ]; then +if [ -z $(which mongod) ] || [ -z $(which mongo) ]; then echo 'Installing MongoDB' MONGODB_ORG_VERSION=3.0.6 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 &>/dev/null