diff options
| -rwxr-xr-x | Vagrantfile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Vagrantfile b/Vagrantfile index 505883aa0..575eec765 100755 --- a/Vagrantfile +++ b/Vagrantfile @@ -30,16 +30,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # To prevent "dpkg-preconfigure: unable to re-open stdin: No such file or directory" warnings export DEBIAN_FRONTEND=noninteractive # Make sure git submodules are checked out! - if [ ! -e fixmystreet/commonlib/.git ]; then - echo "Checking out submodules" - apt-get -qq install -y git >/dev/null - cd fixmystreet - git submodule --quiet update --init --recursive - cd commonlib - git config core.worktree "../../../commonlib" - echo "gitdir: ../.git/modules/commonlib" > .git - cd ../.. - fi + echo "Checking submodules exist/up to date" + apt-get -qq install -y git >/dev/null + cd fixmystreet + git submodule --quiet update --init --recursive --rebase + cd commonlib + git config core.worktree "../../../commonlib" + echo "gitdir: ../.git/modules/commonlib" > .git + cd ../.. # Fetch and run install script wget -O install-site.sh --no-verbose https://github.com/mysociety/commonlib/raw/master/bin/install-site.sh sh install-site.sh --dev fixmystreet vagrant 127.0.0.1.xip.io |