Skip to content

Commit

Permalink
fix: ensure RUBYGEMS_GEMDEPS is unset for all scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
bethesque committed Feb 15, 2018
1 parent 42420b3 commit d1f3656
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions packaging/pact-broker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact-broker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact-mock-service.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact-mock-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact-provider-verifier.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
2 changes: 1 addition & 1 deletion packaging/pact-provider-verifier.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1
unset RUBYGEMS_GEMDEPS # See https://github.com/pact-foundation/pact-mock-service-npm/issues/16

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
exec "$LIBDIR/ruby/bin/ruby" -rbundler/setup -rreadline -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-provider-verifier.rb" "$@"
1 change: 1 addition & 0 deletions packaging/pact-publish.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
2 changes: 1 addition & 1 deletion packaging/pact-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1
unset RUBYGEMS_GEMDEPS # See https://github.com/pact-foundation/pact-mock-service-npm/issues/16

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
exec "$LIBDIR/ruby/bin/ruby" -rbundler/setup -rreadline -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-publish.rb" "$@"
1 change: 1 addition & 0 deletions packaging/pact-stub-service.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact-stub-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CALL :RESOLVE "%RUNNING_PATH%\.." ROOT_PATH
:: Tell Bundler where the Gemfile and gems are.
set "BUNDLE_GEMFILE=%ROOT_PATH%\lib\vendor\Gemfile"
set BUNDLE_IGNORE_CONFIG=
set RUBYGEMS_GEMDEPS=
set BUNDLE_FROZEN=1

:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down
1 change: 1 addition & 0 deletions packaging/pact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
# Tell Bundler where the Gemfile and gems are.
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
unset BUNDLE_IGNORE_CONFIG
unset RUBYGEMS_GEMDEPS
export BUNDLE_FROZEN=1

# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
Expand Down

0 comments on commit d1f3656

Please sign in to comment.