Mercurial > hg > release > thermostat-1.6

changeset 2006:e16bebab8ccb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Version name-space default USER_THERMOSTAT_HOME. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-July/020168.html PR3084
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 04 Jul 2016 18:45:24 +0200
parents 603fe7a03a9c
children d73f83d9af81
files config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java distribution/scripts/thermostat-devsetup
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java	Mon Jul 04 14:14:33 2016 -0400
+++ b/config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java	Mon Jul 04 18:45:24 2016 +0200
@@ -88,7 +88,7 @@
     private static final String THERMOSTAT_SYSTEM_USER = "THERMOSTAT_SYSTEM_USER";
 
 
-    private static final String THERMOSTAT_USER_DIR = ".thermostat";
+    private static final String THERMOSTAT_USER_DIR = ".thermostat-1.6";
 
     private static final Translate<LocaleResources> t = LocaleResources.createLocalizer();
 
--- a/config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java	Mon Jul 04 14:14:33 2016 -0400
+++ b/config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java	Mon Jul 04 18:45:24 2016 +0200
@@ -143,7 +143,7 @@
         try {
             thermostatHome = setupTempDir("CommonPathsImplTest.testUserLocations",
                     THERMOSTAT_HOME_PROPERTY);
-            String userHome = System.getProperty("user.home") + s + ".thermostat";
+            String userHome = System.getProperty("user.home") + s + ".thermostat-1.6";
             CommonPaths config = new CommonPathsImpl();
 
             Assert.assertEquals(concatPath(userHome, "etc", "agent.properties"),
--- a/distribution/scripts/thermostat-devsetup	Mon Jul 04 14:14:33 2016 -0400
+++ b/distribution/scripts/thermostat-devsetup	Mon Jul 04 18:45:24 2016 +0200
@@ -49,7 +49,7 @@
 THERMOSTAT_SETUP="$THERMOSTAT_HOME/bin/thermostat-setup"
 DEV_INPUT="$THERMOSTAT_HOME/etc/devsetup.input"
 if [ "x$USER_THERMOSTAT_HOME" == "x" ]; then
-  USER_THERMOSTAT_HOME="$HOME/.thermostat"
+  USER_THERMOSTAT_HOME="$HOME/.thermostat-1.6"
 fi
 
 # Call the setup script