Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
service uses internal node
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanmacfarlane committed Apr 21, 2016
1 parent 91e63b8 commit 935c62e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vsoagent-installer",
"description": "Visual Studio Xplat Build Agent Installer",
"main": "bin/install.js",
"version": "0.6.3",
"version": "0.6.5",
"vsoAgentInfo": {
"serviceMilestone": "1.999.0"
},
Expand Down Expand Up @@ -42,10 +42,10 @@
"semver": "^5.1.0",
"shelljs": "0.3.x",
"svchost": "0.1.x",
"svcinstall": "^0.2.1",
"svcinstall": "^0.3.0",
"validator": "~3.11.0",
"vso-node-api": "^3.0.1",
"vso-task-lib": "^0.5.0",
"vso-node-api": "^3.0.2",
"vso-task-lib": "^0.5.5",
"xmlreader": "^0.2.3"
},
"devDependencies": {
Expand Down
8 changes: 2 additions & 6 deletions src/agent/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,9 @@ var svcName = 'vsoagent.' + accountName + '.' + agentName;
console.log('serviceName: vsoagent.' + svcName);
var svcinstall = new si.SvcInstall();

/*
if (typeof svcinstall[action] !== 'function') {
showUsage(1);
}*/
// use internal node
var nodePath = path.join(__dirname, '..', 'runtime/node/bin/node');

// node is known as nodejs on some *nix installs
var nodePath = shelljs.which('nodejs') || shelljs.which('node');
var getSvcCfg = function () {
if (!shelljs.test('-f', _cfgPath)) {
console.error('Error: not configured as a service. use install action.');
Expand Down

0 comments on commit 935c62e

Please sign in to comment.