Skip to content

Commit

Permalink
Merge branch 'master' into added-manjaro-linux-os
Browse files Browse the repository at this point in the history
  • Loading branch information
William Blankenship authored Nov 22, 2018
2 parents 06bed04 + e290eff commit 0a52c31
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ var async = require('async')
var distros = require('./os.json')
var fs = require('fs')
var os = require('os')
var path = require('path')

/**
* Begin definition of globals.
Expand Down Expand Up @@ -121,7 +120,7 @@ function getName (candidate) {
* Loads a custom logic module to populate additional distribution information
*/
function customLogic (os, name, file, cb) {
var logic = path.join(__dirname, 'logic/' + name + '.js')
var logic = './logic/' + name + '.js'
try { require(logic)(os, file, cb) } catch (e) { cb(null, os) }
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"cli-color": "1.3.0",
"execSync": "1.0.2",
"standard": "^10.0.2",
"standard": "^12.0.1",
"tape": "4.8.0"
},
"dependencies": {
Expand Down

0 comments on commit 0a52c31

Please sign in to comment.