projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8784-dir-listings'
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
ready
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index 977f61298ff7c475f69c7097e6b15d1650096a1b..3c7eff61765a8b638a9722cf6f489895e3d0c85f 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
. /usr/local/lib/arvbox/common.sh
. /usr/local/lib/arvbox/common.sh
@@
-70,11
+73,11
@@
if ! [[ -z "$waiting" ]] ; then
/usr/src/arvados/apps/workbench/Gemfile.lock \
/usr/src/sso/Gemfile.lock ; do
gc=$(cat $l \
/usr/src/arvados/apps/workbench/Gemfile.lock \
/usr/src/sso/Gemfile.lock ; do
gc=$(cat $l \
- | grep -vE "(GEM|PLATFORMS|DEPENDENCIES|
$^|remote:|specs
:)" \
+ | grep -vE "(GEM|PLATFORMS|DEPENDENCIES|
BUNDLED|GIT|$^|remote:|specs:|revision
:)" \
| sed 's/^ *//' | sed 's/(.*)//' | sed 's/ *$//' | sort | uniq | wc -l)
gemlockcount=$(($gemlockcount + $gc))
done
| sed 's/^ *//' | sed 's/(.*)//' | sed 's/ *$//' | sort | uniq | wc -l)
gemlockcount=$(($gemlockcount + $gc))
done
- waiting="$waiting (installing ruby gems $gemcount
/
$gemlockcount)"
+ waiting="$waiting (installing ruby gems $gemcount
of about
$gemlockcount)"
fi
if ps x | grep -v grep | grep "c++.*/var/lib/passenger" > /dev/null ; then
fi
if ps x | grep -v grep | grep "c++.*/var/lib/passenger" > /dev/null ; then