From 9e9e53befe3db1dd557fe721822604aad8261f52 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Wed, 14 Jul 2021 13:57:37 -0400
Subject: [PATCH] Add ARVADOS_BRANCH and WORKBENCH2_BRANCH to arvbox

no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 doc/install/arvbox.html.textile.liquid | 2 +-
 tools/arvbox/bin/arvbox                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/install/arvbox.html.textile.liquid b/doc/install/arvbox.html.textile.liquid
index a8235ee70e..8b3994edd2 100644
--- a/doc/install/arvbox.html.textile.liquid
+++ b/doc/install/arvbox.html.textile.liquid
@@ -16,7 +16,7 @@ h2. Quick start
 <pre>
 $ curl -O https://git.arvados.org/arvados.git/blob_plain/refs/heads/main:/tools/arvbox/bin/arvbox
 $ chmod +x arvbox
-$ ./arvbox start localdemo latest
+$ ./arvbox start localdemo
 $ ./arvbox adduser demouser demo@example.com
 </pre>
 
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index fd464974fb..5bc74e6aa0 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -250,6 +250,7 @@ run() {
         if ! test -d "$ARVADOS_ROOT" ; then
             git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
 	    git -C "$ARVADOS_ROOT" checkout $ARVADOS_BRANCH
+	    git -C "$ARVADOS_ROOT" pull
         fi
         if ! test -d "$COMPOSER_ROOT" ; then
             git clone https://github.com/arvados/composer.git "$COMPOSER_ROOT"
@@ -258,6 +259,7 @@ run() {
         if ! test -d "$WORKBENCH2_ROOT" ; then
             git clone https://git.arvados.org/arvados-workbench2.git "$WORKBENCH2_ROOT"
 	    git -C "$ARVADOS_ROOT" checkout $WORKBENCH2_BRANCH
+	    git -C "$ARVADOS_ROOT" pull
         fi
 
         if [[ "$CONFIG" = test ]] ; then
-- 
2.30.2