Tidy up path splitting

Author: lukeapage

bin/lessc

@@ -2,6 +2,7 @@
 
 var path = require('path'),
     fs = require('../lib/less-node/fs'),
+    os = require("os"),
     errno,
     mkdirp;
 
@@ -152,13 +153,11 @@ function printUsage() {
                 break;
             case 'include-path':
                 if (checkArgFunc(arg, match[2])) {
-                    // support for both ; and : path separators
-                    // even on windows when using absolute paths with drive letters (eg C:\path:D:\path)
-                    var uniqueString = '!@#$%^&*()';
-                    options.paths = match[2].replace(/\b([a-z]):([\\\/])/gi, '$1' + uniqueString + '$2')
-                        .split(/[;:]/)
+                    // ; supported on windows.
+                    // : supported on windows and linux, excluding a drive letter like C:\ so C:\file:D:\file parses to 2
+                    options.paths = match[2]
+                        .split(os.type().match(/Windows/) ? /:(?!\\)|;/ : ':')
                         .map(function(p) {
-                            p = p.replace(uniqueString, ':');
                             if (p) {
                                 return path.resolve(process.cwd(), p);
                             }

lib/less-node/lessc-helper.js

@@ -27,7 +27,7 @@ var lessc_helper = {
         console.log("");
         console.log("options:");
         console.log("  -h, --help               Prints help (this message) and exit.");
-        console.log("  --include-path=PATHS     Sets include paths. Separated by `:'. `;' also supported.");
+        console.log("  --include-path=PATHS     Sets include paths. Separated by `:'. `;' also supported on windows.");
         console.log("  -M, --depends            Outputs a makefile import dependency list to stdout.");
         console.log("  --no-color               Disables colorized output.");
         console.log("  --no-ie-compat           Disables IE compatibility checks.");

lib/less-rhino/index.js

@@ -266,11 +266,9 @@ function writeFile(filename, content) {
                 if (checkArgFunc(arg, match[2])) {
                     // support for both ; and : path separators
                     // even on windows when using absolute paths with drive letters (eg C:\path:D:\path)
-                    var uniqueString = '!@#$%^&*()';
-                    options.paths = match[2].replace(/\b([a-z]):([\\\/])/gi, '$1' + uniqueString + '$2')
-                        .split(/[;:]/)
+                    options.paths = match[2]
+                        .split(os.type().match(/Windows/) ? /:(?!\\)|;/ : ':')
                         .map(function(p) {
-                            p = p.replace(uniqueString, ':');
                             if (p) {
 //                                return path.resolve(process.cwd(), p);
                                 return p;