dcp-client 5.1.4 → 5.1.6

package/index.js

@@ -1170,7 +1170,13 @@ exports.createConfigFragments = async function dcpClient$$createConfigFragments(
  *  5 - pull the scheduler's config, and layer it on top of the current configuration to find scheduler
  */
   const etc  = process.env.DCP_ETCDIR || (os.platform() === 'win32' ? process.env.ALLUSERSPROFILE : '/etc');
-  const home = process.env.DCP_HOMEDIR || os.homedir();
+  let resourceDir;
+  if (process.env.DCP_RESOURCE_DIR)
+    resourceDir = process.env.DCP_RESOURCE_DIR;
+  else if (process.env.XDG_DATA_HOME)
+    resourceDir = path.resolve(process.env.XDG_DATA_HOME, 'dcp');
+  else
+    resourceDir = path.resolve(os.homedir(), '.dcp');
   let programName = options.programName;
   const progDir = process.mainModule ? path.dirname(process.mainModule.filename) : process.cwd();
   var   remoteConfig, remoteConfigKVIN;
@@ -1224,9 +1230,9 @@ exports.createConfigFragments = async function dcpClient$$createConfigFragments(
    * Note: this code is Sep 2022, overriding older spec, spec update to come. /wg
    *
    * The basic idea is that key collisions are overridden on the basis of "most specificity to current
-   * executable wins" - so local disk is stronger than remote network config, homedir is stronger than
+   * executable wins" - so local disk is stronger than remote network config, resourceDir is stronger than
    * /etc, BUT we also have an override in /etc, and specific-program-name config files in /etc are more
-   * powerful than those in the user's homedir. The reason for this is so that sysadmins can create
+   * powerful than those in the user's resourceDir. The reason for this is so that sysadmins can create
    * strongish machine-wide configuration/security-theatre policies. These are not real security, as
    * any intelligent user can always change the source code to do whatever they please, but it does
    * make sense for campus configurations where sysadmins believe the machines are locked down, etc.
@@ -1235,9 +1241,9 @@ exports.createConfigFragments = async function dcpClient$$createConfigFragments(
         addConfigFile(localConfig, etc,    'dcp/dcp-config');
   await addConfigRKey(localConfig, 'HKLM', 'dcp/dcp-config');
    cn = addConfigFile(localConfig, options.configName && path.resolve(progDir, options.configName));
-        addConfigFile(localConfig, home,  '.dcp/dcp-config');
+        addConfigFile(localConfig, resourceDir,  'dcp-config');
   await addConfigRKey(localConfig, 'HKCU', 'dcp/dcp-config');
-        addConfigFile(localConfig, home,  `.dcp/${programName}/dcp-config`);
+        addConfigFile(localConfig, resourceDir,  `${programName}/dcp-config`);
   await addConfigRKey(localConfig, 'HKCU', `dcp/${programName}/dcp-config`);
         addConfig    (localConfig, initConfig);
         addConfigEnv (localConfig, 'DCP_CONFIG_');

package/ns-map.js

@@ -44,7 +44,7 @@ module.declare([], function $$nsMap(require, exports, module) {
     'dcp-url',
     'cli',
     'dcp-timers',
-    'dcp-dot-dir',
+    'resource-dir',
     'dcp-events',
     'eth',
     'serialize',

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dcp-client",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "dcp": {
-    "version": "883cef28f5a276fecd93cc2b77434ee6d251bcac",
+    "version": "353e61c1189b2131d9dfa1e397a43fe9da830845",
     "repository": "git@gitlab.com:Distributed-Compute-Protocol/dcp.git"
   },
   "description": "Core libraries for accessing DCP network",

package/test-helpers/setup-testenv.js

@@ -10,7 +10,7 @@
 
 const path = require('path');
 
-process.env.DCP_HOMEDIR = path.resolve(path.dirname(module.filename), '../test-pseudo-root/home/username');
+process.env.DCP_RESOURCE_DIR = path.resolve(path.dirname(module.filename), '../test-pseudo-root/home/username/.dcp');
 process.env.DCP_ETCDIR  = path.resolve(path.dirname(module.filename), '../test-pseudo-root/etc');
 if (!process.env.DCP_CONFIG_LOCATION)
    process.env.DCP_CONFIG_LOCATION = '';
@@ -27,11 +27,11 @@ if (require('os').platform() === 'win32')
 }
 
 /* Some tests don't load dcp-client */
-var dcpDcp;
+var resourceDir;
 try
 {
-  dotDcp = require('dcp/dcp-dot-dir');
+  resourceDir = require('dcp/resource-dir');
 }
 catch(e) {};
-if (dcpDcp)
-  dotDcp.setHomeDir(process.env.DCP_HOMEDIR);
+if (resourceDir)
+  resourceDir.setResourceDir(process.env.DCP_RESOURCE_DIR);

package/test-pseudo-root/home/username/README.md

@@ -1,3 +1,3 @@
 This directory is used as the user's homedir while tests are running.
-The hidden directory .dcp is important. There is a symlink to it, named
-dotDcp, which is provided to make editing the tests a bit easier.
+
+The hidden directory, `.dcp`, acts as the test fixture for `DCP_RESOURCE_DIR`.