From 1a31845d150a525ba78b72939c15fa743d66c238 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Thu, 19 May 2016 12:11:27 +0200
Subject: [PATCH] Fixing skipping installation cin
---
install | 12 ++++++++++--
script/show_solutions | 11 +++++++----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/install b/install
index 744e8f2cb..fb179b6a0 100755
--- a/install
+++ b/install
@@ -125,7 +125,11 @@ if [ $sq -eq 0 ]; then
fi
echo -e "\033[1mHow many core you want to use to install the dependencies?\033[0m"
-read ncore
+if [ $sq -eq 0 ]; then
+ read ncore
+else
+ ncore = 4
+fi
echo -e "Installing requirements into: $i_dir "
@@ -141,7 +145,11 @@ if [ ! -d "$i_dir/PETSC" -o ! -d "$i_dir/EIGEN" ]; then
echo -e "\033[1;34m Optional packages \033[0m"
echo -e "\033[1mDo you want to install linear algebra packages ?(y/n)\033[0m"
echo "Installation can take long time (90 minutes on i7-3612QM 4 cores)"
- read inst_lin_alg
+ if [ $sq -eq 0 ]; then
+ read inst_lin_alg
+ else
+ inst_lin_alg = n
+ fi
# if [ ! x"$choose" == x"0" ]; then
# ./script/install_PETSC.sh $i_dir $choose
diff --git a/script/show_solutions b/script/show_solutions
index bb1af0875..c738530b3 100755
--- a/script/show_solutions
+++ b/script/show_solutions
@@ -1,6 +1,11 @@
#! /bin/bash
function possible_solutions {
+
+ if [ $sq -eq 0 ]; then
+ return
+ fi
+
sol=1
echo "Possible solutions:"
for com in "$@"
@@ -15,9 +20,7 @@ function possible_solutions {
exit 1
fi
possible_solutions_ret=`expr $choose - 1`
- if [ $sq -eq 0 ]; then
- echo "Executing: ${command[$possible_solutions_ret]}"
- eval ${commands[$possible_solutions_ret]}
- fi
+ echo "Executing: ${command[$possible_solutions_ret]}"
+ eval ${commands[$possible_solutions_ret]}
}
--
GitLab