diff --git a/funi.js b/funi.js index aefcf0c..0fe8701 100644 --- a/funi.js +++ b/funi.js @@ -19,18 +19,17 @@ const m3u8 = require('m3u8-parsed'); const streamdl = require('hls-download'); // extra -const modulesFolder = __dirname + '/modules'; -const appYargs = require(modulesFolder+'/module.app-args'); -const getYamlCfg = require(modulesFolder+'/module.cfg-loader'); -const getData = require(modulesFolder + '/module.getdata.js'); -const vttConvert = require(modulesFolder + '/module.vttconvert'); +const appYargs = require('./modules/module.app-args'); +const getYamlCfg = require('./modules/module.cfg-loader'); +const getData = require('./modules/module.getdata.js'); +const vttConvert = require('./modules/module.vttconvert'); // new-cfg -const cfgFolder = __dirname + '/config'; -const binCfgFile = path.join(cfgFolder,'bin-path'); -const dirCfgFile = path.join(cfgFolder,'dir-path'); -const cliCfgFile = path.join(cfgFolder,'cli-defaults'); -const tokenFile = path.join(cfgFolder,'token'); +const cfgFolder = path.join(__dirname, '/config'); +const binCfgFile = path.join(cfgFolder, 'bin-path'); +const dirCfgFile = path.join(cfgFolder, 'dir-path'); +const cliCfgFile = path.join(cfgFolder, 'cli-defaults'); +const tokenFile = path.join(cfgFolder, 'token'); // params let cfg = { diff --git a/modules/build.js b/modules/build.js index 516c4c5..3a1113c 100644 --- a/modules/build.js +++ b/modules/build.js @@ -4,10 +4,10 @@ const pkg = require('../package.json'); const fs = require('fs-extra'); const modulesCleanup = require('removeNPMAbsolutePaths'); -const { compile } = require('nexe'); +const { exec } = require('pkg'); const buildsDir = './_builds'; -const nodeVer = ''; +const nodeVer = 'node14-'; // main (async function(){ @@ -28,27 +28,23 @@ const nodeVer = ''; fs.removeSync(buildDir); } fs.mkdirSync(buildDir); - fs.mkdirSync(`${buildDir}/bin`); - fs.mkdirSync(`${buildDir}/config`); - fs.mkdirSync(`${buildDir}/videos`); - fs.mkdirSync(`${buildDir}/videos/_trash`); - const buildConfig = { - loglevel: 'verbose', - input: './crunchy.js', - output: `${buildDir}/${pkg.short_name}`, - target: getTarget(buildType) + nodeVer, - resources: [ - './modules/module.*', - ], - }; + const buildConfig = [ + pkg.main, + '--target', nodeVer + getTarget(buildType), + '--output', `${buildDir}/${pkg.short_name}`, + ]; console.log(`[Build] Build configuration: ${buildFull}`); try { - await compile(buildConfig); + await exec(buildConfig); } catch(e){ console.log(e); process.exit(1); } + fs.mkdirSync(`${buildDir}/bin`); + fs.mkdirSync(`${buildDir}/config`); + fs.mkdirSync(`${buildDir}/videos`); + fs.mkdirSync(`${buildDir}/videos/_trash`); fs.copySync('./bin/', `${buildDir}/bin/`); fs.copySync('./config/bin-path.yml', `${buildDir}/config/bin-path.yml`); fs.copySync('./config/cli-defaults.yml', `${buildDir}/config/cli-defaults.yml`); diff --git a/package.json b/package.json index c592bda..1044f72 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "fs-extra": "^9.0.1", - "nexe": "^3.3.7", + "pkg": "^4.4.9", "removeNPMAbsolutePaths": "^2.0.0" }, "scripts": {