diff --git a/install.sh b/install.sh index 175b206..8dd7623 100755 --- a/install.sh +++ b/install.sh @@ -106,12 +106,13 @@ set -ex function install_apt { if [ -n "${APT_GET}" ]; then if [ -z "${SKIP_UPDATE}" ]; then - sudo apt-get update + ${SUDO} apt-get update fi - if echo $PYVER|grep "3\."; then - sudo apt-get -y install libreadline6-dev python3-dev python3-setuptools python3-yaml python3-pip + _PYVER=$1 + if echo $_PYVER|grep "3\."; then + ${SUDO} apt-get -y install libreadline6-dev python3-dev python3-setuptools python3-yaml python3-pip else - sudo apt-get -y install libreadline6-dev python-dev python-setuptools python-yaml python-pip + ${SUDO} apt-get -y install libreadline6-dev python-dev python-setuptools python-yaml python-pip fi fi } @@ -132,17 +133,18 @@ function install_yum { PARAMS="$PARAMS --refresh" fi - if echo $PYVER|grep "3\."; then - sudo $CMD $PARAMS install readline-devel python3-devel python3-setuptools python3-yaml python3-pip + _PYVER=$1 + if echo $_PYVER|grep "3\."; then + ${SUDO} $CMD $PARAMS install readline-devel python3-devel python3-setuptools python3-yaml python3-pip else - sudo $CMD $PARAMS install readline-devel python-devel python-setuptools python-yaml python-pip + ${SUDO} $CMD $PARAMS install readline-devel python-devel python-setuptools python-yaml python-pip fi fi } function install_packages { - install_apt - install_yum + install_apt $1 + install_yum $1 } function curl_get_pip { @@ -204,7 +206,7 @@ if [ "${BACKEND_GDB}" -eq 1 ]; then GDB_PYTHON=$(${GDB} -batch -q --nx -ex 'pi import sys; print(sys.executable)') GDB_PYTHON="${GDB_PYTHON/%$GDB_PYVER/}${GDB_PYVER}" - install_packages + install_packages $GDB_PYVER if [ -z $USER_MODE ]; then GDB_SITE_PACKAGES=$(${GDB} -batch -q --nx -ex 'pi import site; print(site.getsitepackages()[0])') @@ -247,7 +249,7 @@ if [ "${BACKEND_LLDB}" -eq 1 ]; then LLDB_SITE_PACKAGES=$(${LLDB} -Q -x -b --one-line 'script import site; print(site.getusersitepackages())'|tail -1) || quit "Failed to locate site-packages." 1 fi - install_packages || quit "Failed to install packages." 1 + install_packages $LLDB_PYVER || quit "Failed to install packages." 1 if [ "$LLDB_SITE_PACKAGES" == "$GDB_SITE_PACKAGES" ]; then echo "Skipping installation for LLDB - same site-packages directory" @@ -284,7 +286,7 @@ if [ "${BACKEND_GDB}" -ne 1 ] && [ "${BACKEND_LLDB}" -ne 1 ]; then PYTHON_SITE_PACKAGES=$(${PYTHON} -c 'import site; print(site.getusersitepackages())') fi - install_packages + install_packages $PYVER # Install Voltron and dependencies ${SUDO} ${PYTHON} -m pip install -U $USER_MODE $DEV_MODE .