diff --git a/scripts/distro-deps.sh b/scripts/distro-deps.sh index 7439ed594..cda487753 100755 --- a/scripts/distro-deps.sh +++ b/scripts/distro-deps.sh @@ -31,7 +31,7 @@ case "$distro" in sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y # for g++-10 sudo apt-get update &> $LOG_DIR/apt_update.log echo "|-- running apt install..." - sudo apt-get install -y git libtool m4 curl automake pkg-config libffi-dev python python3 python3-pip wamerican-insane bc bsdmainutils g++-10 python3-testresources &> $LOG_DIR/apt_install.log + sudo apt-get install -y git libtool m4 curl automake pkg-config libffi-dev python python3 python3-pip wamerican-insane bc bsdmainutils g++-10 python3-testresources python3-setuptools &> $LOG_DIR/apt_install.log echo "|-- make g++-10 default..." sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 sudo update-alternatives --set g++ /usr/bin/g++-10 @@ -43,14 +43,14 @@ case "$distro" in add-apt-repository ppa:ubuntu-toolchain-r/test -y # for g++-10 apt-get update &> $LOG_DIR/apt_update.log echo "|-- running apt install..." - apt-get install -y git libtool curl sudo procps m4 automake pkg-config libffi-dev python python3 python3-pip wamerican-insane bc bsdmainutils g++-10 python3-testresources &> $LOG_DIR/apt_install.log + apt-get install -y git libtool curl sudo procps m4 automake pkg-config libffi-dev python python3 python3-pip wamerican-insane bc bsdmainutils g++-10 python3-testresources python3-setuptools &> $LOG_DIR/apt_install.log echo "|-- make g++-10 default..." sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 sudo update-alternatives --set g++ /usr/bin/g++-10 ;; fedora*) echo "|-- running dnf install...." - dnf install git gcc gcc-c++ python python3-pip make curl automake autoconf libtool hostname bc procps python3-testresources -y &> $LOG_DIR/dnf_install.log + dnf install git gcc gcc-c++ python python3-pip make curl automake autoconf libtool hostname bc procps python3-testresources python3-setuptools -y &> $LOG_DIR/dnf_install.log ;; arch*) echo "Updating mirrors" diff --git a/scripts/setup-pash.sh b/scripts/setup-pash.sh index 4e8c3f130..615f74cf4 100755 --- a/scripts/setup-pash.sh +++ b/scripts/setup-pash.sh @@ -75,9 +75,9 @@ echo "export distro=$distro" > ~/.pash_init cd ../ echo "Installing python dependencies..." -python3 -m pip install jsonpickle -t $PYTHON_PKG_DIR &> $LOG_DIR/pip_install_jsonpickle.log -python3 -m pip install numpy &> $LOG_DIR/pip_install_numpy.log -python3 -m pip install matplotlib &> $LOG_DIR/pip_install_matplotlib.log +python3 -m pip install jsonpickle --root $PYTHON_PKG_DIR #&> $LOG_DIR/pip_install_jsonpickle.log +python3 -m pip install numpy #&> $LOG_DIR/pip_install_numpy.log +python3 -m pip install matplotlib #&> $LOG_DIR/pip_install_matplotlib.log echo "Generating input files..."