Commit 2788b8557756e7f2321b45efaf2f13b3de910d1f
bootstrap: use resolved name-version for tmpdir
cel committed on 9/3/2018, 4:37:03 AMParent: fa6fcae9e8c547c7ff7db1e6c990ef35ebf5436f
Files changed
| index.js | changed |
| index.js | |||
|---|---|---|---|
| @@ -670,9 +670,8 @@ | |||
| 670 | 670 … | var postInstallCmd = self.server.npmConfig.postInstallCmd | |
| 671 | 671 … | if (postInstallCmd == null) postInstallCmd = 'sbot server' | |
| 672 | 672 … | var ssbNpmRegistryName = require('./package.json').name | |
| 673 | 673 … | var ssbNpmRegistryVersion = require('./package.json').version | |
| 674 | - var ssbNpmRegistryNameVersion = ssbNpmRegistryName + '-' + ssbNpmRegistryVersion | ||
| 675 | 674 … | var ssbNpmRegistrySpec = ssbNpmRegistryName + '@^' + ssbNpmRegistryVersion | |
| 676 | 675 … | var done = multicb({pluck: 1, spread: true}) | |
| 677 | 676 … | self.resolvePkg(ssbNpmRegistrySpec, done()) | |
| 678 | 677 … | self.resolvePkgs(pkgs, done()) | |
| @@ -680,8 +679,9 @@ | |||
| 680 | 679 … | if (err) return self.respondErrorStr(500, err.stack || err) | |
| 681 | 680 … | if (!ssbNpmRegistryPkgInfo) return self.respondErrorStr(500, 'Missing ssb-npm-registry package') | |
| 682 | 681 … | var ssbNpmRegistryBlobId = ssbNpmRegistryPkgInfo.blobId | |
| 683 | 682 … | var ssbNpmRegistryBlobHex = idToHex(ssbNpmRegistryBlobId) | |
| 683 … | + var ssbNpmRegistryNameVersion = ssbNpmRegistryPkgInfo.name + '-' + ssbNpmRegistryPkgInfo.version | ||
| 684 | 684 … | var pkgMsgs = pkgsInfo.map(function (info) { return info.msgId }) | |
| 685 | 685 … | var globalPkgs = pkgsInfo.map(function (info) { | |
| 686 | 686 … | return info.name + '@' + info.version | |
| 687 | 687 … | }).join(' ') | |
Built with git-ssb-web