Commit 59b93e44 authored by incardon's avatar incardon

Fixing installation for Archlinux

parent 99f7c9fa
......@@ -15,6 +15,7 @@ fi
# Detect gcc pr clang
source script/discover_os
source script/solve_python
discover_os
##### if we are on osx we use gsed
......@@ -369,6 +370,13 @@ function haveProg() {
if haveProg python2; then
python_command=python2
else
# we check that python is python2
dgc_major=$(python --version 2>&1 | grep Python | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1/g')
if [ $dgc_major -eq 3 ]; then
# we have to install python2
solve_pyhton
fi
python_command=python
fi
......
......@@ -10,13 +10,10 @@ if [ x"$pcman" = x"" ]; then
exit 1
fi
if [ x"$1" = x"osx" ]; then
commands[0]="$pcman install autoconf"
possible_solutions "${commands[@]}"
elif [ x"$1" = x"linux" ]; then
if [ x"$1" = x"linux" ]; then
pc_install_command "$pcman"
commands[0]="su -c \"$pc_install_command_ret python\""
commands[1]="sudo $pc_install_command_ret python"
commands[0]="su -c \"$pc_install_command_ret python2\""
commands[1]="sudo $pc_install_command_ret python2"
possible_solutions "${commands[@]}"
fi
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment