[ARVADOS] updated: b8573fab8e641eab5adc123e9f335510bff65172

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

       via  b8573fab8e641eab5adc123e9f335510bff65172 (commit)
      from  9aecc4974eecdfaf94db275112c2a37601802fe7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b8573fab8e641eab5adc123e9f335510bff65172
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 11:26:44 2016 -0400

    10025: If $TAG starts with '-' it is not a tag.

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index e1949f1..54f5b82 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -104,6 +104,8 @@ run() {
     CONFIG=$1
     TAG=$2
 
+    shift
+
     if docker ps -a --filter "status=running" | grep -E "$ARVBOX_CONTAINER$" -q ; then
         echo "Container $ARVBOX_CONTAINER is already running"
         exit 0
@@ -116,8 +118,12 @@ run() {
 
     if test ! -z "$TAG"
     then
-        # XXX should push tag back onto argument list if it starts with '-'
-	TAG=":$TAG"
+        if test $(echo $TAG | cut -c1-1) != '-' ; then
+	    TAG=":$TAG"
+            shift
+        else
+            unset TAG
+        fi
     fi
 
     if echo "$CONFIG" | grep '^public' ; then
@@ -210,7 +216,6 @@ run() {
                    /usr/local/lib/arvbox/runsu.sh \
                    /var/lib/arvbox/service/api/run-service --only-setup
 
-            shift ; shift
             docker exec -ti \
                    $ARVBOX_CONTAINER \
                    /usr/local/lib/arvbox/runsu.sh \

-----------------------------------------------------------------------


hooks/post-receive
--