fix util require path

japel · Oct 24, 2013 · de4a9ca · de4a9ca
1 parent 247fcc6
commit de4a9ca
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/lib/app/index.js b/lib/app/index.js
@@ -4,8 +4,8 @@
 
 var EventEmitter	= require('events').EventEmitter,
 	async			= require('async'),
-	util			= require('sails/lib/util'),
 	log				= require('sails/lib/hooks/logger/captains')(),
+	util			= require('../util'),
 	loadSails		= require('./load'),
 	onTeardown		= require('./teardown'),
 	exposeGlobals	= require('./exposeGlobals'),
@@ -114,11 +114,11 @@ function Sails () {
 	this.lift = function (configOverride, cb) {
 		// Make callback optional
 		cb = util.optional(cb);
-		
+
 		var sails = this;
 
 		async.series([
-			
+
 			function (cb) {
 				sails.load(configOverride, cb);
 			},
@@ -147,7 +147,7 @@ function Sails () {
 
 	this.lower = function (cb) {
 		var sails = this;
-		
+
 		sails.log.verbose('Lowering sails...');
 		cb = util.optional(cb);
 		sails._exiting = true;

diff --git a/lib/configuration/index.js b/lib/configuration/index.js
@@ -4,7 +4,7 @@ module.exports = function (sails) {
 	 * Module dependencies.
 	 */
 
-	var util	= require('sails/lib/util'),
+	var util	= require('../util'),
 		fs		= require('fs');
 
 

diff --git a/lib/hooks/controllers/controller.create.js b/lib/hooks/controllers/controller.create.js
@@ -5,7 +5,7 @@ module.exports = function (sails) {
 	 */
 
 	var idHelper = require('./helpers/id')(sails),
-		util = require('sails/lib/util');
+		util = require('../../util');
 
 
 	/**

diff --git a/lib/hooks/controllers/controller.destroy.js b/lib/hooks/controllers/controller.destroy.js
@@ -6,7 +6,7 @@ module.exports = function (sails) {
 	 */
 
 	var idHelper = require('./helpers/id')(sails),
-		util = require('sails/lib/util');
+		util = require('../../util');
 
 
 

diff --git a/lib/hooks/controllers/controller.find.js b/lib/hooks/controllers/controller.find.js
@@ -5,7 +5,7 @@ module.exports = function (sails) {
 	 */
 
 	var idHelper = require('./helpers/id')(sails),
-		util = require('sails/lib/util');
+		util = require('../../util');
 
 
 	/**

diff --git a/lib/hooks/controllers/controller.update.js b/lib/hooks/controllers/controller.update.js
@@ -5,7 +5,7 @@ module.exports = function (sails) {
 	 */
 
 	var idHelper = require('./helpers/id')(sails),
-		util = require('sails/lib/util');
+		util = require('../../util');
 
 
 	/**

diff --git a/lib/hooks/controllers/helpers/id.js b/lib/hooks/controllers/helpers/id.js
@@ -5,7 +5,7 @@ module.exports = function (sails) {
 	 * Module dependencies.
 	 */
 
-	var util		= require('sails/lib/util');
+	var util		= require('../../../util');
 
 
 	/**

diff --git a/lib/hooks/controllers/index.js b/lib/hooks/controllers/index.js
@@ -8,7 +8,7 @@ module.exports = function(sails) {
 	var _ = require('lodash'),
 		async = require('async'),
 		pluralize = require('pluralize'),
-		util = require('sails/lib/util'),
+		util = require('../../util'),
 		Controller = {
 			find: require('./controller.find.js')(sails),
 			create: require('./controller.create.js')(sails),

diff --git a/lib/hooks/cors/index.js b/lib/hooks/cors/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 */
 
 	var _ = require('lodash'),
-		util = require('sails/lib/util'),
+		util = require('../../util'),
 		expresstUtils = require('../../../node_modules/express/lib/utils.js');
 		Hook = require('../../index');
 

diff --git a/lib/hooks/csrf/index.js b/lib/hooks/csrf/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 */
 
 	var _ = require('lodash'),
-		util = require('sails/lib/util'),
+		util = require('../../util'),
 		Hook = require('../../index');
 
 

diff --git a/lib/hooks/moduleloader/index.js b/lib/hooks/moduleloader/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 * Module dependencies
 	 */
 
-	var util =	require('sails/lib/util'),
+	var util =	require('../../util'),
 		buildDictionary = require('./buildDictionary'),
 		async = require('async');
 

diff --git a/lib/hooks/orm/index.js b/lib/hooks/orm/index.js
@@ -6,7 +6,7 @@ module.exports = function(sails) {
 	 */
 
 
-	var util = require('sails/lib/util'),
+	var util = require('../../util'),
 		async = require('async'),
 		FatalError = require('../../errors/fatal')(sails),
 		loadAppModelsAndAdapters = require('./loadUserModules')(sails),

diff --git a/lib/hooks/orm/loadUserModules.js b/lib/hooks/orm/loadUserModules.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 * Module dependencies.
 	 */
 
-	var util = require('sails/lib/util'),
+	var util = require('../../util'),
 		async = require('async');
 
 

diff --git a/lib/hooks/policies/index.js b/lib/hooks/policies/index.js
@@ -6,7 +6,7 @@ module.exports = function(sails) {
 	 */
 
 	var async = require('async'),
-		util = require('sails/lib/util'),
+		util = require('../../util'),
 		FatalError = require('../../errors/fatal')(sails);
 
 

diff --git a/lib/hooks/pubsub/index.js b/lib/hooks/pubsub/index.js
@@ -6,7 +6,7 @@ module.exports = function(sails) {
 	 */
 
 
-	var util = require('sails/lib/util');
+	var util = require('../../util');
 
 
 	/**

diff --git a/lib/hooks/request/index.js b/lib/hooks/request/index.js
@@ -6,7 +6,7 @@ module.exports = function(sails) {
 	 */
 
 
-	var util = require('sails/lib/util');
+	var util = require('../../util');
 
 
 	/**

diff --git a/lib/hooks/services/index.js b/lib/hooks/services/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 * Module dependencies
 	 */
 
-	var util =	require('sails/lib/util'),
+	var util =	require('../../util'),
 		async = require('async');
 
 

diff --git a/lib/hooks/session/index.js b/lib/hooks/session/index.js
@@ -4,7 +4,7 @@ module.exports = function (sails) {
 	 * Module dependencies.
 	 */
 
-	var util	= require('sails/lib/util'),
+	var util	= require('../../util'),
 		crypto	= require("crypto");
 
 

diff --git a/lib/hooks/sockets/interpreter/getVerb.js b/lib/hooks/sockets/interpreter/getVerb.js
@@ -1,4 +1,4 @@
-var util = require('sails/lib/util');
+var util = require('../../../util');
 
 // Get simulated HTTP verb for a given request object
 module.exports = function getVerb (socketIOData, messageName) {

diff --git a/lib/hooks/userconfig/index.js b/lib/hooks/userconfig/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 * Module dependencies
 	 */
 
-	var util =	require('sails/lib/util'),
+	var util =	require('../../util'),
 		async = require('async');
 
 

diff --git a/lib/hooks/userhooks/index.js b/lib/hooks/userhooks/index.js
@@ -3,7 +3,7 @@ module.exports = function(sails) {
 	/**
 	 * Module dependencies
 	 */
-	var util			= require('sails/lib/util'),
+	var util			= require('../../util'),
 		initializeHooks	= require('../../app/loadHooks')(sails);
 
 	/**

diff --git a/lib/hooks/views/index.js b/lib/hooks/views/index.js
@@ -6,7 +6,7 @@ module.exports = function (sails) {
 	 */
 
 
-	var util			= require('sails/lib/util'),
+	var util			= require('../../util'),
 		async			= require('async'),
 		fs				= require('fs'),
 		path			= require('path'),
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ module.exports = function (sails) { @@
     	 */
     	var idHelper = require('./helpers/id')(sails),
-    		util = require('sails/lib/util');
+    		util = require('../../util');
     	/**
@@ Expand Down @@