refactoring and typing in progress
diff --git a/scripts/install.sh b/scripts/install.sh
index c767b3d..3dfeef7 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -7,24 +7,20 @@
popd > /dev/null
function install_apt() {
- apt-get install -y python-openssl python-novaclient python-cinderclient \
- python-keystoneclient python-glanceclient python-faulthandler \
- python-pip
-
+ MODULES="python-openssl python-faulthandler python-pip"
if [ "$FULL" == "--full" ] ; then
- apt-get install -y python-scipy python-numpy python-matplotlib python-psutil
+ MODULES="$MODULES python-scipy python-numpy python-matplotlib python-psutil"
fi
+ apt-get install -y $MODULES
}
function install_yum() {
- yum -y install pyOpenSSL python-novaclient python-cinderclient \
- python-keystoneclient python-glanceclient \
- python-pip python-ecdsa
-
+ MODULES="pyOpenSSL python-pip python-ecdsa"
if [ "$FULL" == "--full" ] ; then
- yum -y install scipy numpy python-matplotlib python-psutil
+ MODULES="$MODULES scipy numpy python-matplotlib python-psutil"
fi
+ yum -y install $MODULES
}
if which apt-get >/dev/null; then
@@ -33,7 +29,7 @@
if which yum >/dev/null; then
install_yum
else
- echo "Error: Neither apt-get, not yum installed. Can't install deps"
+ echo "Error: Neither apt-get, not yum installed. Can't install binary dependencies."
exit 1
fi
fi
@@ -41,5 +37,5 @@
pip install -r "$SCRIPTPATH/../requirements.txt"
if [ "$FULL" == "--full" ] ; then
- pip install oktest iso8601==0.1.10
+ pip install -r "$SCRIPTPATH/../requirements_extra.txt"
fi