aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2012-11-13 20:06:31 (EST)
committerPascal Rapicault2012-11-14 10:09:39 (EST)
commit1de09b3a95ecff883ebbd1d991f2ec96e1748848 (patch)
treea42e7a96ae29f77be1cbf48ab5874d0995a9871b
parentc2fecc2cda3c512192cc1a3715bb18fb92fb1dc5 (diff)
downloadrt.equinox.framework-1de09b3a95ecff883ebbd1d991f2ec96e1748848.zip
rt.equinox.framework-1de09b3a95ecff883ebbd1d991f2ec96e1748848.tar.gz
rt.equinox.framework-1de09b3a95ecff883ebbd1d991f2ec96e1748848.tar.bz2
Bug 389667 - Folder created in user.home should mention os/ws/archv20121114-150939
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 6a51e42..a63d693 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -1354,10 +1354,15 @@ public class Main {
// add the hash to help prevent collisions
appName += File.separator + installDirHash;
}
+ appName += '_' + OS_WS_ARCHToString();
String userHome = System.getProperty(PROP_USER_HOME);
return new File(userHome, appName + "/" + pathAppendage).getAbsolutePath(); //$NON-NLS-1$
}
+ private String OS_WS_ARCHToString() {
+ return getOS() + '_' + getWS() + '_' + getArch();
+ }
+
/**
* Return hash code identifying an absolute installation path
* @return hash code as String