From 51dad74020ac8ee014ecaf69e0e192e24cc1ab87 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Mon, 16 Apr 2018 10:46:52 +0200
Subject: [PATCH] Eliminating double comtinue, fix Accept and continue install
process
---
install | 2 +-
script/show_solutions | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/install b/install
index 4ce33240b..49063cb9e 100755
--- a/install
+++ b/install
@@ -188,7 +188,7 @@ if [ x"$configure_options" == x"" ]; then
fi
if [ $sq -eq 0 ]; then
unset commands
- commands[0]="continue"
+# commands[0]="continue"
possible_solutions "${commands[@]}"
fi
diff --git a/script/show_solutions b/script/show_solutions
index 4365a22e7..7863387dd 100755
--- a/script/show_solutions
+++ b/script/show_solutions
@@ -30,7 +30,7 @@ function possible_solutions {
if [ -a input_install ]; then
eval ${commands[$possible_solutions_ret]} < input_install
else
- eval ${commands[$possible_solutions_ret]}
+ eval ${commands[$possible_solutions_ret]}
fi
possible_solutions_command=${commands[$possible_solutions_ret]}
}
@@ -59,7 +59,9 @@ function possible_solutions_no_continue {
if [ -a input_install ]; then
eval ${commands[$possible_solutions_ret]} < input_install
else
- eval ${commands[$possible_solutions_ret]}
+ if [ x"${commands[$possible_solutions_ret]}" != x"Accept and continue" ]; then
+ eval ${commands[$possible_solutions_ret]}
+ fi
fi
possible_solutions_command=${commands[$possible_solutions_ret]}
}
--
GitLab