Merge pull request #2920 from exsilium/master

path.exists is now called fs.exists

Author: Mostafa Eweda

build/packed_helper.js

@@ -73,10 +73,11 @@ function rewriteMappings(type, pluginList, callback) {
         var dir = "";
         var c9Prefix = "../plugins-client/ext.";
         var infraPrefix = "../plugins-client/ext.";
+        var exists = fs.existsSync || path.existsSync;
 
-        if (!path.existsSync(path.normalize(__dirname + "/" + c9Prefix + name))) {
+        if (!exists(path.normalize(__dirname + "/" + c9Prefix + name))) {
             //console.warn("Couldn't find " + path.normalize(__dirname + "/" + c9Prefix + name) + "; looking elsewhere...");
-            if (!path.existsSync(path.normalize(__dirname + "/" + infraPrefix + name))) {
+            if (!exists(path.normalize(__dirname + "/" + infraPrefix + name))) {
                 //console.warn("Couldn't find " + path.normalize(__dirname + "/" + infraPrefix + name) + "; looking elsewhere...");
 
                 console.error("We have a problem. I have no idea where " + name + " is referenced.");

plugins-server/connect.session.file/session-ext.js

@@ -2,15 +2,16 @@ var assert = require("assert");
 var path = require("path");
 var fs = require("fs");
 var Store = require("connect/lib/middleware/session/store");
+var exists = fs.existsSync || path.existsSync;
 
 module.exports = function startup(options, imports, register) {
 
     assert(options.sessionsPath, "option 'sessionsPath' is required");
 
-    if (!path.existsSync(path.dirname(options.sessionsPath))) {
+    if (!exists(path.dirname(options.sessionsPath))) {
         fs.mkdir(path.dirname(options.sessionsPath), 0755);
     }
-    if (!path.existsSync(options.sessionsPath)) {
+    if (!exists(options.sessionsPath)) {
         fs.mkdir(options.sessionsPath, 0755);
     }
 
@@ -69,7 +70,8 @@ FileStore.prototype.__proto__ = Store.prototype;
 
 FileStore.prototype.get = function(sid, fn){
   var self = this;
-  path.exists(self.basePath + "/" + sid, function(exists) {
+  var exists = fs.exists || path.exists;
+  exists(self.basePath + "/" + sid, function(exists) {
       if (exists) {
           fs.readFile(self.basePath + "/" + sid, function(err, data) {
               if (err) {
@@ -117,7 +119,8 @@ FileStore.prototype.set = function(sid, sess, fn){
 
 FileStore.prototype.destroy = function(sid, fn){
   var self = this;
-  path.exists(self.basePath + "/" + sid, function(exists) {
+  var exists = fs.exists || path.exists;
+  exists(self.basePath + "/" + sid, function(exists) {
       if (exists) {
           fs.unlink(self.basePath + "/" + sid, function(err) {
               if (err) {

server.js

@@ -29,14 +29,15 @@ process.title = title_parts.join(' ');
 var debug = false;
 var packed = false;
 var packedName = "";
+var exists = fs.existsSync || path.existsSync;
 
 for (var p = 2; p < process.argv.length; p++) {
    if (process.argv[p] === "-d") {
        debug = true;
 
        // apf debug doesn't exist, or it's older than three days--rebuild it
-       if(!path.existsSync("plugins-client/lib.apf/www/apf-packaged/apf_debug.js") ||
-          (path.existsSync("plugins-client/lib.apf/www/apf-packaged/apf_debug.js")) &&
+       if(!exists("plugins-client/lib.apf/www/apf-packaged/apf_debug.js") ||
+          (exists("plugins-client/lib.apf/www/apf-packaged/apf_debug.js")) &&
           ((new Date() - fs.statSync("plugins-client/lib.apf/www/apf-packaged/apf_debug.js").mtime.valueOf()) / 86400000) >= 3) {
            console.log("Building apfdebug for first run...");
 
@@ -68,7 +69,7 @@ for (var p = 2; p < process.argv.length; p++) {
 
        configName = "packed";
 
-       if(!path.existsSync("plugins-client/lib.packed/www/" + packedName) && !path.existsSync("plugins-client/lib.packed/www/" + packedName + ".gz")) {
+       if(!exists("plugins-client/lib.packed/www/" + packedName) && !exists("plugins-client/lib.packed/www/" + packedName + ".gz")) {
            console.log("Building packed file for first run...Please wait...");
            console.log("   |\\      _,,,---,,_\n" +
                        "   /,`.-'`'    -.  ;-;;,_\n" +