more fixes for node v0.10.x

caolan · Apr 6, 2013 · 92bf776 · 92bf776
1 parent ca3b8ec
commit 92bf776
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/lib/commands/clean.js b/lib/commands/clean.js
@@ -57,15 +57,15 @@ exports.run = function (settings, args) {
                 opt.target_dir = path.resolve(proj_dir, cfg.jam.packageDir);
             }
             else {
-                opt.target_dir = path.resolve(proj_dir, settings.package_dir);
+                opt.target_dir = path.resolve(proj_dir, settings.package_dir || '');
             }
         }
         if (!opt.baseurl) {
             if (cfg.jam && cfg.jam.baseUrl) {
                 opt.baseurl = path.resolve(proj_dir, cfg.jam.baseUrl);
             }
             else {
-                opt.baseurl = path.resolve(proj_dir, settings.baseUrl);
+                opt.baseurl = path.resolve(proj_dir, settings.baseUrl || '');
             }
         }
 

diff --git a/lib/commands/compile.js b/lib/commands/compile.js
@@ -146,15 +146,15 @@ exports.compile = function (opt, callback) {
                 opt.pkgdir = path.resolve(pdir, cfg.jam.packageDir);
             }
             else {
-                opt.pkgdir = path.resolve(pdir, opt.settings.package_dir);
+                opt.pkgdir = path.resolve(pdir, opt.settings.package_dir || '');
             }
         }
         if (!opt.baseurl) {
             if (cfg.jam && cfg.jam.baseUrl) {
                 opt.baseurl = path.resolve(pdir, cfg.jam.baseUrl);
             }
             else {
-                opt.baseurl = path.resolve(pdir, opt.settings.baseUrl);
+                opt.baseurl = path.resolve(pdir, opt.settings.baseUrl || '');
             }
         }
 

diff --git a/lib/commands/install.js b/lib/commands/install.js
@@ -130,12 +130,7 @@ exports.extendOptions = function (proj_dir, settings, cfg, opt) {
             opt.baseurl = path.resolve(proj_dir, cfg.jam.baseUrl);
         }
         else {
-            if (settings.baseUrl) {
-                opt.baseurl = path.resolve(proj_dir, settings.baseUrl);
-            }
-            else {
-                opt.baseurl = proj_dir;
-            }
+            opt.baseurl = path.resolve(proj_dir, settings.baseUrl || '');
         }
     }
     return opt;

diff --git a/lib/commands/link.js b/lib/commands/link.js
@@ -63,7 +63,7 @@ exports.run = function (_settings, args, commands) {
             }
 
             project.addJamDependency(cfg, newpkg.name, 'linked');
-            var newpath = path.resolve(opt.target_dir, newpkg.name);
+            var newpath = path.resolve(opt.target_dir, newpkg.name || '');
 
             mkdirp(path.dirname(newpath), function (err) {
                 if (err) {

diff --git a/lib/commands/ls.js b/lib/commands/ls.js
@@ -38,7 +38,7 @@ exports.run = function (_settings, args, commands) {
                 package_dir = path.resolve(proj_dir, cfg.jam.packageDir);
             }
             else {
-                package_dir = path.resolve(proj_dir, _settings.package_dir);
+                package_dir = path.resolve(proj_dir, _settings.package_dir || '');
             }
         }
         else {
@@ -80,7 +80,7 @@ exports.ls = function (_settings, cfg, package_dir, callback) {
                 }
                 line += pkg.name + ' ' + logger.yellow(pkg.version);
                 if (deps[pkg.name] === 'linked') {
-                    var p = path.resolve(package_dir, pkg.name);
+                    var p = path.resolve(package_dir, pkg.name || '');
                     var realpath = fs.readlinkSync(p);
                     line += logger.cyan(' => ' + realpath);
                 }

diff --git a/lib/commands/rebuild.js b/lib/commands/rebuild.js
@@ -53,15 +53,15 @@ exports.run = function (settings, args) {
                 opt.target_dir = path.resolve(proj_dir, cfg.jam.packageDir);
             }
             else {
-                opt.target_dir = path.resolve(proj_dir, settings.package_dir);
+                opt.target_dir = path.resolve(proj_dir, settings.package_dir || '');
             }
         }
         if (!opt.baseurl) {
             if (cfg.jam && cfg.jam.baseUrl) {
                 opt.baseurl = path.resolve(proj_dir, cfg.jam.baseUrl);
             }
             else {
-                opt.baseurl = path.resolve(proj_dir, settings.baseUrl);
+                opt.baseurl = path.resolve(proj_dir, settings.baseUrl || '');
             }
         }
         if (!opt.config) {

diff --git a/lib/repository.js b/lib/repository.js
@@ -232,8 +232,8 @@ exports.findREADME = function (dir, callback) {
         var readme = _.detect(files, function (f) {
             return /^README$|^README\..*$/i.test(f);
         });
-        var filename = path.join(dir, readme);
         if (readme) {
+            var filename = path.join(dir, readme);
             fs.stat(filename, function (err, stat) {
                 if (err) {
                     return callback(err);