Merge pull request #8366 from yurydelendik/rm-shelljs

Removes shelljs

external/.eslintrc

@@ -5,7 +5,6 @@
 
   "env": {
     "node": true,
-    "shelljs": true,
   },
 
   "rules": {

external/crlfchecker/crlfchecker.js

@@ -1,23 +0,0 @@
-'use strict';
-
-function checkIfCrlfIsPresent(files) {
-  var failed = [];
-
-  (ls(files)).forEach(function checkCrlf(file) {
-    if ((cat(file)).match(/.*\r.*/)) {
-      failed.push(file);
-    }
-  });
-
-  if (failed.length) {
-    var errorMessage =
-      'Please remove carriage return\'s from\n' + failed.join('\n') + '\n' +
-      'Also check your setting for: git config core.autocrlf.';
-
-    echo();
-    echo(errorMessage);
-    exit(1);
-  }
-}
-
-exports.checkIfCrlfIsPresent = checkIfCrlfIsPresent;

external/crlfchecker/normtext.js

@@ -1,30 +0,0 @@
-/* Copyright 2012 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var fs = require('fs');
-
-function normalizeText(s) {
- return s.replace(/\r\n?/g, '\n').replace(/\uFEFF/g, '');
-}
-
-var args = process.argv.slice(2);
-
-args.forEach(function (file) {
-  var content = fs.readFileSync(file, 'utf8');
-  content = normalizeText(content);
-  fs.writeFileSync(file, content, 'utf8');
-});

package.json

@@ -23,7 +23,6 @@
     "mkdirp": "^0.5.1",
     "node-ensure": "^0.0.0",
     "rimraf": "^2.4.1",
-    "shelljs": "~0.4.0",
     "streamqueue": "^1.1.1",
     "systemjs": "^0.20.7",
     "systemjs-plugin-babel": "0.0.21",

test/.eslintrc

@@ -5,7 +5,6 @@
 
   "env": {
     "node": true,
-    "shelljs": true,
     "jasmine": true,
   },
 }

test/webbrowser.js

@@ -22,7 +22,6 @@ var fs = require('fs');
 var path = require('path');
 var spawn = require('child_process').spawn;
 var testUtils = require('./testutils.js');
-var shelljs = require('shelljs');
 var crypto = require('crypto');
 
 var tempDirPrefix = 'pdfjs_';
@@ -141,28 +140,41 @@ WebBrowser.prototype = {
     var cmdKillAll, cmdCheckAllKilled, isAllKilled;
 
     if (process.platform === 'win32') {
-      var wmicPrefix = 'wmic process where "not Name = \'cmd.exe\' ' +
+      var wmicPrefix = ['process', 'where', '"not Name = \'cmd.exe\' ' +
         'and not Name like \'%wmic%\' ' +
-        'and CommandLine like \'%' + this.uniqStringId + '%\'" ';
+        'and CommandLine like \'%' + this.uniqStringId + '%\'"'];
-      cmdKillAll = wmicPrefix + 'call terminate';
+      cmdKillAll = {
-      cmdCheckAllKilled = wmicPrefix + 'get CommandLine';
+        file: 'wmic',
+        args: wmicPrefix.concat(['call', 'terminate'])
+      };
+      cmdCheckAllKilled = {
+        file: 'wmic',
+        args: wmicPrefix.concat(['get', 'CommandLine'])
+      };
       isAllKilled = function(exitCode, stdout) {
         return stdout.indexOf(this.uniqStringId) === -1;
       }.bind(this);
     } else {
-      cmdKillAll = 'pkill -f ' + this.uniqStringId;
+      cmdKillAll = {file: 'pkill', args: ['-f', this.uniqStringId]};
-      cmdCheckAllKilled = 'pgrep -f ' + this.uniqStringId;
+      cmdCheckAllKilled = {file: 'pgrep', args: ['-f', this.uniqStringId]};
       isAllKilled = function(pgrepStatus) {
         return pgrepStatus === 1; // "No process matched.", per man pgrep.
       };
     }
     function execAsyncNoStdin(cmd, onExit) {
-      var proc = shelljs.exec(cmd, {
+      var proc = spawn(cmd.file, cmd.args, {
-        async: true,
+        shell: true,
-        silent: true,
+        stdio: 'pipe',
-      }, onExit);
+      });
       // Close stdin, otherwise wmic won't run.
       proc.stdin.end();
+      var stdout = '';
+      proc.stdout.on('data', (data) => {
+        stdout += data;
+      });
+      proc.on('close', (code) => {
+        onExit(code, stdout);
+      });
     }
     var killDateStart = Date.now();
     // Note: First process' output it shown, the later outputs are suppressed.
@@ -235,7 +247,7 @@ ChromiumBrowser.prototype.buildArguments = function (url) {
 
 WebBrowser.create = function (desc) {
   var name = desc.name;
-  var path = shelljs.which(desc.path);
+  var path = fs.realpathSync(desc.path);
   if (!path) {
     throw new Error('Browser executable not found: ' + desc.path);
   }