Skip to content
Browse files

bugfix: global pinf env isolation

  • Loading branch information...
1 parent cf33d44 commit 601b864ae13a6c039cc5e3b2873dc270ce485c85 @cadorn cadorn committed
Showing with 5 additions and 3 deletions.
  1. +3 −1 lib/pinf-loader-js/descriptors.js
  2. +2 −2 lib/pinf-loader-js/loader.js
View
4 lib/pinf-loader-js/descriptors.js
@@ -727,7 +727,9 @@ WorkspaceSources.prototype.augmentLocator = function(locator)
else
// TODO: Make this more generic so it works with other source repositories and sub-paths.
// e.g. { location: 'https://raw.github.com/pinf/server-js/v0.1.14/program.packages.json' }
- if (typeof locator.location !== "undefined" && (m = locator.location.match(/https?:\/\/raw\.(.*?)\/v[^\/]*\/([^\/]*)$/)))
+ if (typeof locator.location !== "undefined" &&
+ (m = locator.location.match(/https?:\/\/raw\.(.*?)\/v[^\/]*\/([^\/]*)$/)) &&
+ API.FILE.exists(this.basePath + "/" + m[1] + "/" + m[2]))
{
locator = API.UTIL.deepCopy(locator);
locator.location = this.basePath + "/" + m[1] + "/" + m[2];
View
4 lib/pinf-loader-js/loader.js
@@ -3,7 +3,7 @@
var boot = exports.boot = function(options)
{
- const VERSION = "0.2.8";
+ const VERSION = "0.2.9";
var timers = {
start: new Date().getTime(),
loadAdditional: 0
@@ -281,7 +281,7 @@ var boot = exports.boot = function(options)
if (!pinfPackagesPath || !API.FILE.exists(pinfPackagesPath)) {
if (pinfPackagesPath) {
- API.DEBUG.print("\0yellow(Warning: Packages path '" + pinfPackagesPath + "' not found. Using default path '" + API.SYSTEM.pwd + "/.pinf-packages" + "' instead.\0)");
+ API.DEBUG.print("\0yellow(Warning: Packages path '" + pinfPackagesPath + "' not found. Using default path '" + API.SYSTEM.pwd + "/.pinf_packages" + "' instead.\0)");
}
pinfPackagesPath = API.SYSTEM.pwd + "/.pinf_packages";
}

0 comments on commit 601b864

Please sign in to comment.
Something went wrong with that request. Please try again.