Skip to content
Snippets Groups Projects
Commit 6326435b authored by Yaser Afshar's avatar Yaser Afshar
Browse files

Fixing installscript

parent f5cba173
No related branches found
No related tags found
No related merge requests found
......@@ -45,7 +45,15 @@ script/pre_req
## clone the dependencies
git submodule init
if [ $? -ne 0 ]; then
echo -e "Configure\033[91;5;1m FAILED \033[0m"
exit 1
fi
git submodule update
if [ $? -ne 0 ]; then
echo -e "Configure\033[91;5;1m FAILED \033[0m"
exit 1
fi
# Create config directory
......@@ -118,7 +126,7 @@ else
fi
./script/install_MPI.sh $i_dir
MPI_installed=1
export PATH="$PATH:${HOME}/MPI/bin"
export PATH="$PATH:$i_dir/MPI/bin"
echo $PATH
configure_options="$configure_options CXX=mpic++ "
elif [ $conf_err -eq 201 ]; then
......@@ -129,7 +137,7 @@ else
fi
./script/install_Metis.sh $i_dir
METIS_installed=1
configure_options=" $configure_options --with-metis=${HOME}/METIS "
configure_options=" $configure_options --with-metis=$i_dir/METIS "
elif [ $conf_err -eq 202 ]; then
echo "Boost not found try to install"
if [ $BOOST_installed -eq 1 ]; then
......@@ -138,7 +146,7 @@ else
fi
./script/install_BOOST.sh $i_dir
BOOST_installed=1
configure_options=" $configure_options --with-boost=${HOME}/BOOST "
configure_options=" $configure_options --with-boost=$i_dir/BOOST "
elif [ $conf_err -ne 0 ]; then
echo "I do not know how to recover from this error"
exit 1
......
openfpm_data @ a0d95989
Subproject commit a0d9598916ff2ec529876c97da99bd4b6983b651
......@@ -7,6 +7,9 @@ platform=unknown
if [[ "$OSTYPE" == "linux-gnu" ]]; then
echo -e "We are on\033[1;34m LINUX \033[0m"
platform=linux
elif [[ "$OSTYPE" == "linux" ]]; then
echo -e "We are on\033[1;34m LINUX \033[0m"
platform=linux
elif [[ "$OSTYPE" == "darwin"* ]]; then
echo -e "We are on\033[1;34m MAC OSX \033[0m"
platform=osx
......
......@@ -30,7 +30,7 @@ function discover_package_manager() {
return
fi
command -v zypper >/dev/null
if [ command -v zypper >/dev/null -eq 0 ]; then
if [ $? -eq 0 ]; then
discover_package_manager_ret="zypper"
return
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment