git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-629 Fix --tempfac. Hide non-working --notempfac. Add --scale, --width, --height...
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
1021a69
..
cf73c81
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-329,7
+329,8
@@
public class Jalview
}
}
}
}
- if (bootstrapArgs.contains(Arg.HELP))
+ if (bootstrapArgs.contains(Arg.HELP)
+ || bootstrapArgs.contains(Arg.VERSION))
{
QUIET = true;
}
{
QUIET = true;
}
@@
-354,12
+355,12
@@
public class Jalview
}.start();
}
}.start();
}
- if (!quiet())
+ if (!quiet() || bootstrapArgs.contains(Arg.VERSION))
{
System.out.println(
"Java version: " + System.getProperty("java.version"));
{
System.out.println(
"Java version: " + System.getProperty("java.version"));
- System.out.println("Java Home: " + System.getProperty("java.home"));
- System.out.println(System.getProperty("os.arch") + " "
+ System.out.println("Java home: " + System.getProperty("java.home"));
+ System.out.println("Java arch: " + System.getProperty("os.arch") + " "
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version"));
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version"));
@@
-390,7
+391,14
@@
public class Jalview
.bootstrapProperties(bootstrapArgs.get(Arg.PROPS));
// report Jalview version
.bootstrapProperties(bootstrapArgs.get(Arg.PROPS));
// report Jalview version
- Cache.loadBuildProperties(true);
+ Cache.loadBuildProperties(
+ !quiet() || bootstrapArgs.contains(Arg.VERSION));
+
+ // stop now if only after --version
+ if (bootstrapArgs.contains(Arg.VERSION))
+ {
+ Jalview.exit(null, 0);
+ }
// old ArgsParser
ArgsParser aparser = new ArgsParser(args);
// old ArgsParser
ArgsParser aparser = new ArgsParser(args);