# vim: sw=4 ts=4 sts=4 et tw=72 :
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
# Ensure that necessary variables are set to enable noninteractive mode in
# commands.
export DEBIAN_FRONTEND=noninteractive
cd ./util
./install.sh -nfv
-echo '---> Install CPqD and dependencies'
-apt-get install -y --force-yes -qq build-essential cmake flex
-apt-get install -y --force-yes -qq libpcre++-dev libxerces-c-dev libpcap-dev libboost-all-dev
-
-cd /tmp
-wget -nc http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_2.5.dfsg-2.1_amd64.deb \
- http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-dpkg -i bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-rm bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-wget -nc http://www.nbee.org/download/nbeesrc-jan-10-2013.zip
-unzip nbeesrc-jan-10-2013.zip
-cd nbeesrc-jan-10-2013/src
-cmake .
-make
-cp ../bin/libn*.so /usr/local/lib
-ldconfig
-cp -R ../include/* /usr/include/
-cd ../..
-
-git clone https://github.com/CPqD/ofsoftswitch13.git
-cd ofsoftswitch13
-./boot.sh
-./configure
-make
-make install
-cd ..
-
echo '---> Installing cbench installation for running openflow performance tests'
-OF_DIR=$HOME/openflow # Directory that contains OpenFlow code
-OFLOPS_DIR=$HOME/oflops # Directory that contains oflops repo
+OF_DIR="$HOME/openflow" # Directory that contains OpenFlow code
+OFLOPS_DIR="$HOME/oflops" # Directory that contains oflops repo
-apt-get install -y --force-yes -qq libsnmp-dev libpcap-dev libconfig-dev
+apt-get install -y --force-yes libsnmp-dev libpcap-dev libconfig-dev
-git clone git://gitosis.stanford.edu/openflow.git $OF_DIR
-git clone https://github.com/andi-bigswitch/oflops.git $OFLOPS_DIR
+git clone git://gitosis.stanford.edu/openflow.git "$OF_DIR"
+git clone https://github.com/andi-bigswitch/oflops.git "$OFLOPS_DIR"
-cd $OFLOPS_DIR
+cd "$OFLOPS_DIR"
./boot.sh
-./configure --with-openflow-src-dir=$OF_DIR
+./configure --with-openflow-src-dir="$OF_DIR"
make
make install
echo '---> Installing vlan for vlan based tests in VTN suites'
-apt-get install -y --force-yes -qq vlan
+apt-get install -y --force-yes vlan
+
+# Install netaddr package which is needed by some custom mininet topologies
+apt-get install -y --force-yes -qq python-netaddr