diff options
| author | John Keiser <john@johnkeiser.com> | 2016-06-01 21:57:12 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-06-01 21:57:12 -0700 |
| commit | e2f4576c0d319794e1c78aeebb5aab5305e84668 (patch) | |
| tree | 47579b38e7c7a42e90cb7386fab127f795125dd0 | |
| parent | b54fedd6d902b70442e7db1b77cd427ae8937937 (diff) | |
| parent | 21e0a9085f707a04a25794b5df9c1cd07638e707 (diff) | |
| download | chef-e2f4576c0d319794e1c78aeebb5aab5305e84668.tar.gz | |
Merge pull request #4989 from chef/jk/set-evx
Add set -evx to shell scripts
| -rwxr-xr-x[-rw-r--r--] | ci/bundle_install.sh | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | ci/dependency_update.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | ci/version_bump.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | ci/version_show.sh | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh index 12d1cda333..519b0e4367 100644..100755 --- a/ci/bundle_install.sh +++ b/ci/bundle_install.sh @@ -1,5 +1,8 @@ #!/bin/sh -gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) -gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) -bundle install +set -evx + +gem environment +bundler_version=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2) +gem install bundler -v $bundler_version --user-install +bundle _${bundler_version}_ install diff --git a/ci/dependency_update.sh b/ci/dependency_update.sh index ad95aed5f5..3ab0c611b6 100644..100755 --- a/ci/dependency_update.sh +++ b/ci/dependency_update.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -evx + . ci/bundle_install.sh bundle exec rake dependencies diff --git a/ci/version_bump.sh b/ci/version_bump.sh index 690ac25088..bd365c712c 100644..100755 --- a/ci/version_bump.sh +++ b/ci/version_bump.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -evx + . ci/bundle_install.sh bundle exec rake version:bump diff --git a/ci/version_show.sh b/ci/version_show.sh index d591cb4661..c8917f2036 100644..100755 --- a/ci/version_show.sh +++ b/ci/version_show.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -evx + . ci/bundle_install.sh bundle exec rake version:show |