Guest User

Untitled

a guest
Jan 22nd, 2018
85
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.50 KB | None | 0 0
  1. diff --git a/Common/node/ijod.js b/Common/node/ijod.js
  2. index e20e6b6..bae4cf9 100644
  3. --- a/Common/node/ijod.js
  4. +++ b/Common/node/ijod.js
  5. @@ -13,14 +13,15 @@
  6. */
  7.  
  8. var fs = require('fs'),
  9. - lconfig = require('lconfig')
  10. + lconfig = require('lconfig'),
  11. + path = require('path'),
  12. lfs = require(__dirname + '/lfs');
  13.  
  14. function IJOD(name, dir) {
  15. this.name = name;
  16. this.dataFileName = name + '.json';
  17. if (dir) {
  18. - this.dataFile = fs.openSync(process.cwd() + "/" + lconfig.me + "/" + dir + "/" + this.dataFileName, 'a');
  19. + this.dataFile = fs.openSync(path.join(process.cwd(),lconfig.me, dir, this.dataFileName), 'a');
  20. } else {
  21. this.dataFile = fs.openSync(this.dataFileName, 'a');
  22. }
  23. @@ -32,4 +33,4 @@ IJOD.prototype.addRecord = function(timeStamp, record, callback) {
  24. var str = JSON.stringify({timeStamp:timeStamp, data:record}) + '\n';
  25. var b = new Buffer(str);
  26. fs.write(this.dataFile, b, 0, b.length, this.fileLength, callback);
  27. -}
  28. \ No newline at end of file
  29. +}
  30. diff --git a/Common/node/lservicemanager.js b/Common/node/lservicemanager.js
  31. index e6e628c..083eee3 100644
  32. --- a/Common/node/lservicemanager.js
  33. +++ b/Common/node/lservicemanager.js
  34. @@ -80,7 +80,7 @@ function mapMetaData(file, type, installable) {
  35. if (metaData.status != 'stub') {
  36. var err = false;
  37. try {
  38. - var stat = fs.statSync(lconfig.lockerDir+"/" + lconfig.me + "/"+metaData.handle);
  39. + var stat = fs.statSync(path.join(lconfig.lockerDir, lconfig.me, metaData.handle));
  40. } catch (E) {
  41. err = true
  42. }
  43. @@ -100,7 +100,7 @@ function mapMetaData(file, type, installable) {
  44. if(metaData.autoInstall) {
  45. var err = false;
  46. try {
  47. - var stat = fs.statSync(lconfig.lockerDir+"/" + lconfig.me + "/"+metaData.handle);
  48. + var stat = fs.statSync(path.join(lconfig.lockerDir, lconfig.me, metaData.handle));
  49. } catch (E) {
  50. err = true
  51. }
  52. @@ -154,7 +154,7 @@ function mergedManifest(dir)
  53. });
  54. if (serviceInfo && serviceInfo.manifest) {
  55.  
  56. - var fullInfo = JSON.parse(fs.readFileSync(lconfig.lockerDir + "/" + serviceInfo.manifest));
  57. + var fullInfo = JSON.parse(fs.readFileSync(path.join(lconfig.lockerDir, serviceInfo.manifest)));
  58. return lutil.extend(js, fullInfo);
  59. } else {
  60. return js;
  61. @@ -224,10 +224,10 @@ exports.migrate = function(installedDir, metaData) {
  62. var ret = migrate(installedDir); // prolly needs to be sync and given a callback someday
  63. if (ret) {
  64. // load new file in case it changed, then save version back out
  65. - var curMe = JSON.parse(fs.readFileSync(lconfig.lockerDir + "/" + lconfig.me + "/" + metaData.id +'/me.json', 'utf-8'));
  66. + var curMe = JSON.parse(fs.readFileSync(path.join(lconfig.lockerDir, lconfig.me, metaData.id, 'me.json'), 'utf-8'));
  67. metaData.version = migrations[i].substring(0, 13);
  68. curMe.version = metaData.version;
  69. - fs.writeFileSync(lconfig.lockerDir + "/" + lconfig.me + "/" + metaData.id + '/me.json', JSON.stringify(curMe, null, 4));
  70. + fs.writeFileSync(path.join(lconfig.lockerDir, lconfig.me, metaData.id, 'me.json'), JSON.stringify(curMe, null, 4));
  71. }else{
  72. // this isn't clean but we have to do something drastic!!!
  73. console.error("failed to run migration!");
  74. @@ -271,9 +271,9 @@ exports.install = function(metaData, installOverride) {
  75. // the inanity of this try/catch bullshit is drrrrrrnt but async is stupid here and I'm offline to find a better way atm
  76. var inc = 0;
  77. try {
  78. - if(fs.statSync(lconfig.lockerDir+"/" + lconfig.me + "/"+serviceInfo.handle).isDirectory()) {
  79. + if(fs.statSync(path.join(lconfig.lockerDir, lconfig.me, serviceInfo.handle)).isDirectory()) {
  80. inc++;
  81. - while(fs.statSync(lconfig.lockerDir+"/" + lconfig.me + "/"+serviceInfo.handle+"-"+inc).isDirectory()) {inc++;}
  82. + while(fs.statSync(path.join(lconfig.lockerDir, lconfig.me, serviceInfo.handle+"-"+inc)).isDirectory()) {inc++;}
  83. }
  84. } catch (E) {
  85. var suffix = (inc > 0)?"-"+inc:"";
  86. @@ -288,8 +288,8 @@ exports.install = function(metaData, installOverride) {
  87. meInfo.is = serviceInfo.is;
  88. meInfo.uri = lconfig.lockerBase+"/Me/"+meInfo.id+"/";
  89. meInfo.version = Date.now();
  90. - fs.mkdirSync(lconfig.lockerDir + "/" + lconfig.me + "/"+meInfo.id,0755);
  91. - fs.writeFileSync(lconfig.lockerDir + "/" + lconfig.me + "/"+meInfo.id+'/me.json',JSON.stringify(meInfo));
  92. + fs.mkdirSync(path.join(lconfig.lockerDir, lconfig.me, meInfo.id),0755);
  93. + fs.writeFileSync(path.join(lconfig.lockerDir, lconfig.me, meInfo.id, 'me.json'),JSON.stringify(meInfo));
  94. serviceMap.installed[meInfo.id] = mergedManifest(path.join(lconfig.me, meInfo.id));
  95.  
  96. var fullInfo = exports.metaInfo(meInfo.id);
  97. @@ -364,13 +364,13 @@ exports.spawn = function(serviceId, callback) {
  98. run = run.split(" "); // node foo.js
  99.  
  100. svc.port = ++lockerPortNext;
  101. - console.log('spawning into: ' + lconfig.lockerDir + '/' + lconfig.me + '/' + svc.id);
  102. + console.log('spawning into: ' + path.join(lconfig.lockerDir, lconfig.me, svc.id));
  103. var processInformation = {
  104. port: svc.port, // This is just a suggested port
  105. - sourceDirectory: lconfig.lockerDir + "/" + svc.srcdir,
  106. - workingDirectory: lconfig.lockerDir + '/' + lconfig.me + '/' + svc.id, // A path into the me directory
  107. + sourceDirectory: path.join(lconfig.lockerDir, svc.srcdir),
  108. + workingDirectory: path.join(lconfig.lockerDir, lconfig.me, svc.id), // A path into the me directory
  109. lockerUrl:lconfig.lockerBase,
  110. - externalBase:lconfig.externalBase + '/Me/' + svc.id + '/'
  111. + externalBase: lconfig.externalBase + '/Me/' + svc.id + '/'
  112. };
  113. if(serviceInfo && serviceInfo.mongoCollections) {
  114. processInformation.mongo = {
  115. @@ -380,7 +380,7 @@ exports.spawn = function(serviceId, callback) {
  116. processInformation.mongo.collections = serviceInfo.mongoCollections;
  117. }
  118. var env = process.env;
  119. - env["NODE_PATH"] = lconfig.lockerDir+'/Common/node/';
  120. + env["NODE_PATH"] = path.join(lconfig.lockerDir, 'Common', 'node');
  121. app = spawn(run.shift(), run, {cwd: svc.srcdir, env:process.env});
  122. app.stdout.setEncoding("utf8");
  123. app.stdout.setEncoding("utf8");
Add Comment
Please, Sign In to add comment