diff --git a/script/show_solutions b/script/show_solutions index c738530b3b024b881f94067090f500f4c82e445c..66c128eda1c4533defd5fb09803461405f5fe4b9 100755 --- a/script/show_solutions +++ b/script/show_solutions @@ -2,7 +2,7 @@ function possible_solutions { - if [ $sq -eq 0 ]; then + if [ $sq -eq 1 ]; then return fi @@ -21,6 +21,10 @@ function possible_solutions { fi possible_solutions_ret=`expr $choose - 1` echo "Executing: ${command[$possible_solutions_ret]}" - eval ${commands[$possible_solutions_ret]} + if [ -a input_install ]; then + eval ${commands[$possible_solutions_ret]} < input_install + else + eval ${commands[$possible_solutions_ret]} + fi } diff --git a/script/solve_gpp b/script/solve_gpp index bfebc468f1606011335bbbaf11a6f2fc87795e17..0e90c56856c08f7b7de01c22fdaa6b9ad5c64a84 100755 --- a/script/solve_gpp +++ b/script/solve_gpp @@ -18,11 +18,19 @@ if [ x"$1" = x"osx" ]; then compiler_gcc="gcc-4.9" compiler_gpp="g++-4.9" elif [ x"$1" = x"linux" ]; then - commands[0]="su -c \"$pcman install gcc-c++\"" - commands[1]="sudo $pcman install gcc-c++" - possible_solutions "${commands[@]}" - compiler_gcc="gcc" - compiler_gpp="g++" + if [ x"$pcman" == x"yum" ]; then + commands[0]="su -c \"$pcman install gcc-c++\"" + commands[1]="sudo $pcman install gcc-c++" + possible_solutions "${commands[@]}" + compiler_gcc="gcc" + compiler_gpp="g++" + else + commands[0]="su -c \"$pcman install g++\"" + commands[1]="sudo $pcman install g++" + possible_solutions "${commands[@]}" + compiler_gcc="gcc" + compiler_gpp="g++" + fi fi }