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-1522 output installation type to stdout
[jalview.git]
/
src
/
jalview
/
bin
/
Cache.java
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
d11bffe
..
3dea84e
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-379,15
+379,21
@@
public class Cache
String jnlpVersion = System.getProperty("jalview.version");
String codeVersion = getProperty("VERSION");
String jnlpVersion = System.getProperty("jalview.version");
String codeVersion = getProperty("VERSION");
-
+ String codeInstallation = getProperty("INSTALLATION");
if (codeVersion == null)
{
// THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
codeVersion = "Test";
jnlpVersion = "Test";
if (codeVersion == null)
{
// THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
codeVersion = "Test";
jnlpVersion = "Test";
+ codeInstallation = "";
+ }
+ else
+ {
+ codeInstallation = " (" + codeInstallation + ")";
}
}
- System.out.println("Jalview Version: " + codeVersion);
+ System.out
+ .println("Jalview Version: " + codeVersion + codeInstallation);
// jnlpVersion will be null if we're using InstallAnywhere
// Dont do this check if running in headless mode
// jnlpVersion will be null if we're using InstallAnywhere
// Dont do this check if running in headless mode