Merged
Conversation
wpoely86
reviewed
May 19, 2017
|
|
||
| if LooseVersion(self.version) >= LooseVersion('2017a'): | ||
| jdir = os.path.join(self.cfg['start_dir'], 'sys', 'java', 'jre', 'glnxa64', 'jre', 'bin') | ||
| for perm_file in [os.path.join(self.cfg['start_dir'], 'bin', 'glnxa64'), jdir]: |
Member
There was a problem hiding this comment.
don't you mean perm_dir here? It's a whole directory?
| chdircmd = 'cd %s &&' % self.builddir | ||
| installerpath = self.cfg['start_dir'] | ||
|
|
||
| cmd = "%s %s %s/install -v -inputFile %s %s" % (self.cfg['preinstallopts'], chdircmd, installerpath, self.configfile, |
Member
There was a problem hiding this comment.
I wouldn't do it like this. Do the chdir before getting to this line (in the if). Mixing in the chdircmd and preinstallopts might do weird things.
wpoely86
reviewed
May 20, 2017
| self.cfg['preinstallopts'] = ('export _JAVA_OPTIONS="%s" && ' % self.cfg['java_options']) + self.cfg['preinstallopts'] | ||
| cmd = "%s ./install -v -inputFile %s %s" % (self.cfg['preinstallopts'], self.configfile, self.cfg['installopts']) | ||
| if LooseVersion(self.version) >= LooseVersion('2017a'): | ||
| run_cmd('cd %s' % self.builddir, log_all=True, simple=True) |
Member
There was a problem hiding this comment.
use change_dir from easybuild.tools.filetools
wpoely86
approved these changes
May 22, 2017
Member
|
lgtm, tested with easybuilders/easybuild-easyconfigs#4616, good to go, thanks @hajgato! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Matlab 2017a install complains that you should not run the installed from the root directory of install CD.