Merge 562339c into ef7d831

jstty · Feb 4, 2018 · 53beceb · 53beceb
2 parents ef7d831 + 562339c
commit 53beceb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/legacy/manager.service.js b/legacy/manager.service.js
@@ -748,7 +748,8 @@ ServiceManager.export = function (serviceName) {
   var files = glob.sync(filePath + path.sep + 'controllers' + path.sep + '*.js');
   // console.log('files:', files);
   _.forEach(files, function (file) {
-    var parts = file.split(path.sep);
+    // "glob.sync" returns paths with normalized separators, so use "/" over path.sep here
+    var parts = file.split('/');
     var name = parts.pop();
     name = name.split('.')[0]; // remove '.js' from name
     service.controller[name] = {

diff --git a/lib/manager.service.js b/lib/manager.service.js
@@ -803,7 +803,8 @@ ServiceManager.export = function (serviceName) {
   var files = glob.sync(filePath + path.sep + 'controllers' + path.sep + '*.js');
     // console.log('files:', files);
   _.forEach(files, function (file) {
-    var parts = file.split(path.sep);
+    // "glob.sync" returns paths with normalized separators, so use "/" over path.sep here
+    var parts = file.split('/');
     var name = parts.pop();
     name = name.split('.')[0]; // remove '.js' from name
     service.controller[name] = {