vagrant provisioning: improve debuging ability

Antonio Terceiro
1 parent 39ffa2ab
Showing 4 changed files with 9 additions and 4 deletions Show diff stats
vagrant/bootstrap.sh
vagrant/centos.sh
vagrant/provision.sh
vagrant/ubuntu.sh
@@ -11,8 +11,8 @@ done
 # very simple OS detection
 if [ -x /usr/bin/apt-get ]; then
-  exec sh $basedir/vagrant/ubuntu.sh
+  exec $basedir/vagrant/ubuntu.sh
 fi
 if [ -x /usr/bin/yum ]; then
-  exec sh $basedir/vagrant/centos.sh
+  exec $basedir/vagrant/centos.sh
 fi
 #!/bin/bash
+set -ex
+
 ### Disable annoying plugin
 sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
 #!/bin/bash
+set -x
+
 export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7"
+set +e
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     source /usr/local/bin/virtualenvwrapper.sh
 else
@@ -13,6 +16,7 @@ if [ ! -d /home/vagrant/.virtualenvs/colab ]; then
 fi
 workon colab
+set -e
 for dir in /vagrant/colab /vagrant; do
     if [ -f $dir/setup.py ]; then
 #!/bin/bash
-UBUNTU=$(lsb_release -sc)
-
+set -ex
 ### Install dependencies
 apt-get update
	@@ -11,8 +11,8 @@ done		@@ -11,8 +11,8 @@ done
11		11
12	# very simple OS detection	12	# very simple OS detection
13	if [ -x /usr/bin/apt-get ]; then	13	if [ -x /usr/bin/apt-get ]; then
14	- exec sh $basedir/vagrant/ubuntu.sh	14	+ exec $basedir/vagrant/ubuntu.sh
15	fi	15	fi
16	if [ -x /usr/bin/yum ]; then	16	if [ -x /usr/bin/yum ]; then
17	- exec sh $basedir/vagrant/centos.sh	17	+ exec $basedir/vagrant/centos.sh
18	fi	18	fi
1	#!/bin/bash	1	#!/bin/bash
2		2
		3	+set -ex
		4	+
3	### Disable annoying plugin	5	### Disable annoying plugin
4	sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf	6	sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
5		7
1	#!/bin/bash	1	#!/bin/bash
2		2
3	-UBUNTU=$(lsb_release -sc)
4	-	3	+set -ex
5		4
6	### Install dependencies	5	### Install dependencies
7	apt-get update	6	apt-get update