summaryrefslogtreecommitdiffstats
path: root/depends
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
commit26a7544325f8fd8939567b270bde9ad1db465f9f (patch)
treea901f9bee1cb6ff019b95fa2776b0dd3be1b45c3 /depends
parentbace3c2eab1effd556ab2c704b26220312e05eb3 (diff)
parentafa5e14e2074343270ff205e042f102c03dface0 (diff)
downloadMultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.gz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.lz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.xz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.zip
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'depends')
-rw-r--r--depends/javacheck/JavaCheck.java22
1 files changed, 16 insertions, 6 deletions
diff --git a/depends/javacheck/JavaCheck.java b/depends/javacheck/JavaCheck.java
index 73688082..11420b86 100644
--- a/depends/javacheck/JavaCheck.java
+++ b/depends/javacheck/JavaCheck.java
@@ -2,13 +2,23 @@ import java.lang.Integer;
public class JavaCheck
{
- private static final String key = "os.arch";
+ private static final String[] keys = {"os.arch", "java.version"};
public static void main (String [] args)
{
- String property = System.getProperty(key);
- System.out.println(key + "=" + property);
- if (property != null)
- System.exit(0);
- System.exit(1);
+ int ret = 0;
+ for(String key : keys)
+ {
+ String property = System.getProperty(key);
+ if(property != null)
+ {
+ System.out.println(key + "=" + property);
+ }
+ else
+ {
+ ret = 1;
+ }
+ }
+
+ System.exit(ret);
}
}