Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
- /var/lib/arvados/bin/gem install --no-document bundler:$BUNDLER_VERSION
+ GEMLOCK=/var/lib/arvados/lib/ruby/gems/gems.lock
+ flock $GEMLOCK /var/lib/arvados/bin/gem install --no-document bundler:$BUNDLER_VERSION
if test -f Gemfile.lock ; then
frozen=--frozen
else
if test -f Gemfile.lock ; then
frozen=--frozen
else
# If present, use the one associated with rails workbench or API
BUNDLER=$PWD/bin/bundle
fi
# If present, use the one associated with rails workbench or API
BUNDLER=$PWD/bin/bundle
fi
- if ! $BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then
- $BUNDLER install --verbose --no-deployment $frozen "$@"
+ if ! flock $GEMLOCK $BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then
+ flock $GEMLOCK $BUNDLER install --verbose --no-deployment $frozen "$@"
EOF
cd /usr/src/arvados/sdk/cli
EOF
cd /usr/src/arvados/sdk/cli
-run_bundler --binstubs
-ln -sf /usr/src/arvados/sdk/cli/bin/arv /usr/local/bin/arv
+run_bundler --binstubs=binstubs
+ln -sf /usr/src/arvados/sdk/cli/binstubs/arv /usr/local/bin/arv