Browse Source

quick vagrant fix (#2512)

* quick vagrant fix

* fix fwroot
Nate 8 years ago
parent
commit
3ae344d7ca
1 changed files with 5 additions and 3 deletions
  1. 5 3
      deployment/vagrant-common/bootstrap.sh

+ 5 - 3
deployment/vagrant-common/bootstrap.sh

@@ -63,9 +63,6 @@ if [ ! -e "~/.firstboot" ]; then
     cat /etc/hosts
   fi
 
-  # Update the benchmark.cfg for vagrant
-  sed -i s/techempower/vagrant/g ~/FrameworkBenchmarks/benchmark.cfg
-
   # Workaround mitchellh/vagrant#289
   echo "grub-pc grub-pc/install_devices multiselect     /dev/sda" | sudo debconf-set-selections
 
@@ -92,9 +89,14 @@ if [ ! -e "~/.firstboot" ]; then
     #sudo mount -o bind /tmp/TFB_installs $FWROOT/installs
   #else
     # If there is no synced folder, clone the project
+    export FWROOT="/home/vagrant/FrameworkBenchmarks"
+    echo FWROOT="/home/vagrant/FrameworkBenchmarks" >> ~/.bashrc
     echo "Cloning project from $GH_REPO $GH_BRANCH"
     git config --global core.autocrlf input
     git clone -b ${GH_BRANCH} https://github.com/${GH_REPO}.git $FWROOT
+    cd ~/FrameworkBenchmarks
+    # Update the benchmark.cfg for vagrant
+    sed -i s/techempower/vagrant/g ~/FrameworkBenchmarks/benchmark.cfg
     source ~/FrameworkBenchmarks/toolset/setup/linux/prerequisites.sh
   #fi