-
Notifications
You must be signed in to change notification settings - Fork 212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Usage of system-java in linux startup script. #64
Usage of system-java in linux startup script. #64
Conversation
If no TWS-Java is found, the linux startup script now also searches for a Java version installed on the system and uses it, if it is from oracle.
Thanks for this. Just a couple of points to be made. In IBController.sh:
In userguide.md:
Actually I think I'd prefer you to leave the userguide.md alone for the moment, as I need to do a bit of work on it anyway, and I'll consider the best way to approach this issue then. |
- both config files are now searched for a valid java path - the system installed java is not used if a valid java path was found in configs
Right. Fixed it. |
Sorry for the delay with this: I wanted to properly test it before merging (I'm confident it's correct but better safe than sorry!), but unfortunately my Ubuntu VM has malfunctioned and I've run out of time (I'll be out for the rest of the day). |
Absolutely no problem! Have a nice weekend! |
I pulled your changes into my clone and copied them across to my Ubuntu VM, and encountered the following problems:
Having corrected these two problems, it all worked fine, but there are a couple of minor points that would improve it somewhat:
Finally, please allow the Thanks. |
Sorry for the delay. I will look into it in the next couple of days. |
- when supplying a path via --java-path, search there for binary named "java", not java.exe - better identifying system java as oracle java - output starts with upper case character
|
Thanks for the update. I haven't had time to look at it yet (will do over the weekend), but I just wanted to respond to your points.
|
Didn't know autocrlf defaults to true, but makes sense, I guess... I found the source of the path outputs, it was not the function (see commit). They should be gone in the new version. |
I was going to merge this, but then I noticed that it says there are conflicts that need to be resolved. I can't understand how there can be conflicts. The single file changed by this PR hasn't been modified in the main repository since this PR was raised. Is it something to do with PR #67, which would modify the same file if it were merged? If so it just seems odd, as both PRs seem to me to be entirely consistent with the current state of things, even though if either were merged it would render the other in conflict. Can you throw any light on this, just so I'm sure I understand what I'm doing? |
Conflicts: resources/Scripts/IBController.sh
My fork was not a clean fork in the sense that our master branches are identical, because I added some things. Therefore I didn't merge the current master of your repository, but I did that now and resolved the conflicts. You can check them in the last commit. |
Usage of system-java in linux startup script.
If no TWS-Java is found, the linux startup script now also searches for
a Java version installed on the system and uses it, if it is from oracle.
As discussed in issue #62.