Update oss.rb #681
Merged
Update oss.rb #681
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+ oscli_bundle to cmd
|
still need to make some tests but should be good for a hot fix |
|
@brianlball Nice! Yeah, if we can add an integration test that uses a custom gems with init script that would be great. I'll just wait for tests to complete and then merge in. |
tijcolem
approved these changes
Jan 5, 2023
| # syntax to explicitly unset a bunch of env vars is very different for windows | ||
| # Use the default shell to query for OpenStudio version. Not neccessary to unset these. | ||
| #unset_vars = Gem.win_platform? || ENV['OS'] == 'Windows_NT' ? 'set ' + Utility::Oss::ENV_VARS_TO_UNSET_FOR_OSCLI.join('= && set ') : 'unset ' + Utility::Oss::ENV_VARS_TO_UNSET_FOR_OSCLI.join(' && unset ') | ||
| oscli_cmd = "#{Utility::Oss.oscli_cmd} openstudio_version" | ||
| oscli_cmd = "#{Utility::Oss.oscli_cmd(Rails.logger).split.first} openstudio_version" |
There was a problem hiding this comment.
Should we make a new function oscli_cmd_no_bundle_args()?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
issue #680