Merge pull request #473 from nathansamson/nathan/vagrant-space-fix2

LGTM, tested with Vagrant and EC2.

Author: mboersma

contrib/digitalocean/prepare-digitalocean-snapshot.sh

@@ -11,9 +11,6 @@
 #   4. Create/update your Deis flavors to use your new snapshot
 #
 
-THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
-CONTRIB_DIR=$(dirname $THIS_DIR)
-
 # Remove old kernel(s)
 dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo apt-get -y purge
 

contrib/digitalocean/provision-digitalocean-controller.sh

@@ -15,10 +15,10 @@ function echo_color {
 }
 
 THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
-CONTRIB_DIR=$(dirname $THIS_DIR)
+CONTRIB_DIR=$(dirname "$THIS_DIR")
 
 # check for Deis' general dependencies
-if ! $CONTRIB_DIR/check-deis-deps.sh; then
+if ! "$CONTRIB_DIR/check-deis-deps.sh"; then
   echo 'Deis is missing some dependencies.'
   exit 1
 fi

contrib/ec2/provision-ec2-controller.sh

@@ -13,10 +13,10 @@ function echo_color {
 }
 
 THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
-CONTRIB_DIR=$(dirname $THIS_DIR)
+CONTRIB_DIR=$(dirname "$THIS_DIR")
 
 # check for Deis' general dependencies
-if ! $CONTRIB_DIR/check-deis-deps.sh; then
+if ! "$CONTRIB_DIR/check-deis-deps.sh"; then
   echo 'Deis is missing some dependencies.'
   exit 1
 fi

contrib/rackspace/provision-rackspace-controller.sh

@@ -13,10 +13,10 @@ function echo_color {
 }
 
 THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
-CONTRIB_DIR=$(dirname $THIS_DIR)
+CONTRIB_DIR=$(dirname "$THIS_DIR")
 
 # check for Deis' general dependencies
-if ! $CONTRIB_DIR/check-deis-deps.sh; then
+if ! "$CONTRIB_DIR/check-deis-deps.sh"; then
   echo 'Deis is missing some dependencies.'
   exit 1
 fi

contrib/vagrant/provision-controller.sh

@@ -52,7 +52,7 @@ knife data bag create deis-apps 2>/dev/null
 
 # Boot the deis-controller VM
 echo_color "Booting $node_name with 'vagrant up'"
-pushd $THIS_DIR/../../
+pushd "$THIS_DIR/../../"
 vagrant up --provision
 if [ $? -gt 0 ]; then
   echo_color "Canceling provision because 'vagrant up' failed"