Browse Source

Make it possible to override default python version in install.sh

master
James Hilliard 7 years ago
parent
commit
a612ddba72
  1. 34
      install.sh

34
install.sh

@ -84,7 +84,7 @@ venv_setup ()
else else
reinstall='true' reinstall='true'
fi fi
virtualenv -p python2 "${jm_source}/jmvenv" || return 1 virtualenv -p "${python}" "${jm_source}/jmvenv" || return 1
source "${jm_source}/jmvenv/bin/activate" || return 1 source "${jm_source}/jmvenv/bin/activate" || return 1
pip install --upgrade pip pip install --upgrade pip
pip install --upgrade setuptools pip install --upgrade setuptools
@ -392,18 +392,37 @@ joinmarket_install ()
parse_flags () parse_flags ()
{ {
for flag in ${@}; do while :; do
case ${flag} in case $1 in
--develop) --develop)
develop_build='1' develop_build='1'
;; ;;
--no-gpg-validation) --no-gpg-validation)
no_gpg_validation='1' no_gpg_validation='1'
;; ;;
*) -p|--python)
echo "warning. unknown flag : ${flag}" 1>&2 if [[ "$2" ]]; then
python="$2"
shift
else
echo 'ERROR: "--python" requires a non-empty option argument.'
return 1
fi
;;
--python=?*)
python="${1#*=}"
;;
--python=)
echo 'ERROR: "--python" requires a non-empty option argument.'
return 1
;; ;;
-?*)
echo "warning. unknown flag : $1" 1>&2
;;
*)
break
esac esac
shift
done done
} }
@ -471,8 +490,11 @@ main ()
# flags # flags
develop_build='' develop_build=''
no_gpg_validation='' no_gpg_validation=''
python='python2'
reinstall='false' reinstall='false'
parse_flags ${@} if ! parse_flags ${@}; then
return 1
fi
# os check # os check
install_os="$( install_get_os )" install_os="$( install_get_os )"

Loading…
Cancel
Save