More fixes to install-deps.sh
This commit is contained in:
parent
5f9b110b08
commit
49c3b9c449
@ -349,6 +349,7 @@ function run_installer()
|
|||||||
|
|
||||||
function get_linux_dependencies()
|
function get_linux_dependencies()
|
||||||
{
|
{
|
||||||
|
find_curl
|
||||||
find_git
|
find_git
|
||||||
find_make
|
find_make
|
||||||
find_gcc
|
find_gcc
|
||||||
@ -372,10 +373,10 @@ function run_installer()
|
|||||||
uncheck "apt-get is missing"
|
uncheck "apt-get is missing"
|
||||||
isApt=false
|
isApt=false
|
||||||
|
|
||||||
if [[ $isGCC == false || $isGit == false || $isMake == false ]]; then
|
if [[ $isGCC == false || $isGit == false || $isMake == false || $isCurl == false ]]; then
|
||||||
canContinue=false
|
canContinue=false
|
||||||
errorMessages+="${red}==>${reset} ${b}Couldn't find apt-get:${reset} We can only use apt-get in order to grab our dependencies.\n"
|
errorMessages+="${red}==>${reset} ${b}Couldn't find apt-get:${reset} We can only use apt-get in order to grab our dependencies.\n"
|
||||||
errorMessages+=" Please switch to a distribution such as Debian or Ubuntu or manually install the required packages, git, make and g++/gcc.\n"
|
errorMessages+=" Please switch to a distribution such as Debian or Ubuntu or manually install the missing packages.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -431,6 +432,23 @@ function run_installer()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function find_curl()
|
||||||
|
{
|
||||||
|
depCount=$((depCount+1))
|
||||||
|
MAKE_PATH=`which curl 2>/dev/null`
|
||||||
|
|
||||||
|
if [[ -f $CURL_PATH ]]
|
||||||
|
then
|
||||||
|
depFound=$((depFound+1))
|
||||||
|
check "curl"
|
||||||
|
isCurl=true
|
||||||
|
else
|
||||||
|
uncheck "curl is missing"
|
||||||
|
isCurl=false
|
||||||
|
INSTALL_FILES+="${blue}${dim}==> curl:${reset}\n"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function linux_rocksdb_installer()
|
function linux_rocksdb_installer()
|
||||||
{
|
{
|
||||||
oldpwd=`pwd`
|
oldpwd=`pwd`
|
||||||
@ -447,7 +465,7 @@ function run_installer()
|
|||||||
|
|
||||||
function linux_installer()
|
function linux_installer()
|
||||||
{
|
{
|
||||||
if [[ $isGCC == false || $isGit == false || $isMake == false ]]; then
|
if [[ $isGCC == false || $isGit == false || $isMake == false || $isCurl == false ]]; then
|
||||||
info "Installing build dependencies..."
|
info "Installing build dependencies..."
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
if [[ $isGit == false ]]; then
|
if [[ $isGit == false ]]; then
|
||||||
@ -459,6 +477,9 @@ function run_installer()
|
|||||||
if [[ $isMake == false ]]; then
|
if [[ $isMake == false ]]; then
|
||||||
sudo apt-get install -q -y make
|
sudo apt-get install -q -y make
|
||||||
fi
|
fi
|
||||||
|
if [[ $isCurl == false ]]; then
|
||||||
|
sudo apt-get install -q -y curl
|
||||||
|
fi
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user