Commit 146c8e09 by Austin Pivarnik

Replace reserved word 'package' with 'pkg'

parent 16be724d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
var flags = {}, var flags = {},
fs = require('fs'), fs = require('fs'),
package = require('../package.json'), pkg = require('../package.json'),
path = require('path'); path = require('path');
/** /**
...@@ -63,8 +63,8 @@ function getBinaryName() { ...@@ -63,8 +63,8 @@ function getBinaryName() {
binaryName = flags['--sass-binary-name']; binaryName = flags['--sass-binary-name'];
} else if (process.env.SASS_BINARY_NAME) { } else if (process.env.SASS_BINARY_NAME) {
binaryName = process.env.SASS_BINARY_NAME; binaryName = process.env.SASS_BINARY_NAME;
} else if (package.nodeSassConfig && package.nodeSassConfig.binaryName) { } else if (pkg.nodeSassConfig && pkg.nodeSassConfig.binaryName) {
binaryName = package.nodeSassConfig.binaryName; binaryName = pkg.nodeSassConfig.binaryName;
} else { } else {
binaryName = [process.platform, '-', binaryName = [process.platform, '-',
process.arch, '-', process.arch, '-',
...@@ -104,8 +104,8 @@ function getBinaryName() { ...@@ -104,8 +104,8 @@ function getBinaryName() {
function getBinaryUrl() { function getBinaryUrl() {
var site = flags['--sass-binary-site'] || var site = flags['--sass-binary-site'] ||
process.env.SASS_BINARY_SITE || process.env.SASS_BINARY_SITE ||
package.nodeSassConfig.binarySite; pkg.nodeSassConfig.binarySite;
return [site, 'v' + package.version, sass.binaryName].join('/'); return [site, 'v' + pkg.version, sass.binaryName].join('/');
} }
...@@ -138,8 +138,8 @@ sass.getBinaryPath = function(throwIfNotExists) { ...@@ -138,8 +138,8 @@ sass.getBinaryPath = function(throwIfNotExists) {
binaryPath = flags['--sass-binary-path']; binaryPath = flags['--sass-binary-path'];
} else if (process.env.SASS_BINARY_PATH) { } else if (process.env.SASS_BINARY_PATH) {
binaryPath = process.env.SASS_BINARY_PATH; binaryPath = process.env.SASS_BINARY_PATH;
} else if (package.nodeSassConfig && package.nodeSassConfig.binaryPath) { } else if (pkg.nodeSassConfig && pkg.nodeSassConfig.binaryPath) {
binaryPath = package.nodeSassConfig.binaryPath; binaryPath = pkg.nodeSassConfig.binaryPath;
} else { } else {
binaryPath = path.join(__dirname, '..', 'vendor', sass.binaryName.replace(/_/, '/')); binaryPath = path.join(__dirname, '..', 'vendor', sass.binaryName.replace(/_/, '/'));
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
var eol = require('os').EOL, var eol = require('os').EOL,
path = require('path'), path = require('path'),
util = require('util'), util = require('util'),
package = require('../package.json'); pkg = require('../package.json');
require('./extensions'); require('./extensions');
...@@ -23,7 +23,7 @@ var binding = require(process.sass.getBinaryPath(true)); ...@@ -23,7 +23,7 @@ var binding = require(process.sass.getBinaryPath(true));
function getVersionInfo(binding) { function getVersionInfo(binding) {
return [ return [
['node-sass', package.version, '(Wrapper)', '[JavaScript]'].join('\t'), ['node-sass', pkg.version, '(Wrapper)', '[JavaScript]'].join('\t'),
['libsass ', binding.libsassVersion(), '(Sass Compiler)', '[C/C++]'].join('\t'), ['libsass ', binding.libsassVersion(), '(Sass Compiler)', '[C/C++]'].join('\t'),
].join(eol); ].join(eol);
} }
......
...@@ -7,7 +7,7 @@ var fs = require('fs'), ...@@ -7,7 +7,7 @@ var fs = require('fs'),
npmconf = require('npmconf'), npmconf = require('npmconf'),
path = require('path'), path = require('path'),
request = require('request'), request = require('request'),
package = require('../package.json'); pkg = require('../package.json');
require('../lib/extensions'); require('../lib/extensions');
...@@ -33,7 +33,7 @@ function download(url, dest, cb) { ...@@ -33,7 +33,7 @@ function download(url, dest, cb) {
options.headers = { options.headers = {
'User-Agent': [ 'User-Agent': [
'node/', process.version, ' ', 'node/', process.version, ' ',
'node-sass-installer/', package.version 'node-sass-installer/', pkg.version
].join('') ].join('')
}; };
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment