clearlinux/usrbinjava
2
0
Fork 0
mirror of https://github.com/clearlinux/usrbinjava.git synced 2026-09-02 20:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: clearlinux/usrbinjava:1.1
Branches Tags
clearlinux/usrbinjava:master
clearlinux/usrbinjava:v1.3 clearlinux/usrbinjava:v1.2 clearlinux/usrbinjava:v1.1 clearlinux/usrbinjava:1.1 clearlinux/usrbinjava:v1.0
...
compare: clearlinux/usrbinjava:v1.3
Branches Tags
clearlinux/usrbinjava:master
clearlinux/usrbinjava:v1.3 clearlinux/usrbinjava:v1.2 clearlinux/usrbinjava:v1.1 clearlinux/usrbinjava:1.1 clearlinux/usrbinjava:v1.0
2 Commits
1.1 ... v1.3
Author SHA1 Message Date
Athenas Jimenez 924d209803 Use basename to get command 
Signed-off-by: Athenas Jimenez <athenas.jimenez.gonzalez@intel.com>
 2019-11-11 17:19:26 +00:00
Athenas Jimenez 90dc1097c5 Keep OpenJDK 8 as default for now 
Signed-off-by: Athenas Jimenez <athenas.jimenez.gonzalez@intel.com>
 2019-11-08 17:06:28 +00:00
1 changed files with 7 additions and 7 deletions
Expand all files Collapse all files
src/main.c
+7 -7
View File
@@ -48,14 +48,14 @@ int main(int argc, char **argv)
strcpy(java, secure_getenv("JAVA_HOME")); strcpy(java, secure_getenv("JAVA_HOME"));
} }
else { else {
if (access("/usr/lib/jvm/java-1.11.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.8.0-openjdk", F_OK) == 0) {
strcpy(java, "/usr/lib/jvm/java-1.11.0-openjdk"); strcpy(java, "/usr/lib/jvm/java-1.8.0-openjdk");
setenv("JAVA_HOME", "/usr/lib/jvm/java-1.11.0-openjdk", 0); setenv("JAVA_HOME", "/usr/lib/jvm/java-1.8.0-openjdk", 0);
} }
else { else {
if (access("/usr/lib/jvm/java-1.8.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.11.0-openjdk", F_OK) == 0) {
strcpy(java, "/usr/lib/jvm/java-1.8.0-openjdk"); strcpy(java, "/usr/lib/jvm/java-1.11.0-openjdk");
setenv("JAVA_HOME", "/usr/lib/jvm/java-1.8.0-openjdk", 0); setenv("JAVA_HOME", "/usr/lib/jvm/java-1.11.0-openjdk", 0);
} }
else { else {
if (access("/usr/lib/jvm/java-1.13.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.13.0-openjdk", F_OK) == 0) {
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
} }
strcat(java, "/bin/"); strcat(java, "/bin/");
strncat(java, argv[0], 25); strncat(java, basename(argv[0]), 25);
// If cannot access // If cannot access
if (access(java, X_OK)) { if (access(java, X_OK)) {