Skip to content

Fix kernel download issues #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
facekapow merged 4 commits into from
Oct 4, 2015
Merged

Fix kernel download issues #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54aaa4e
Fix kernel download issues
facekapow Oct 1, 2015
5067d3e
Use ~/.runtimef
facekapow Oct 3, 2015
9b25ae5
Add --local kernel download option
facekapow Oct 4, 2015
2a3507b
Parse local as boolean
facekapow Oct 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bin/runtime-qemu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

var argv = require('minimist')(process.argv.slice(2), {
boolean: ['kvm', 'verbose', 'nographic', 'dry-run', 'netdump', 'curses', 'virtio-rng']
boolean: ['kvm', 'verbose', 'nographic', 'dry-run', 'netdump', 'curses', 'virtio-rng', 'local']
});
var shell = require('shelljs');
var qemu = require('../qemu');
Expand Down Expand Up @@ -54,6 +54,7 @@ if (!command) {
shell.echo(' --virtio-rng Enable VIRTIO-RNG entropy source for the runtime.js');
shell.echo(' --nographic Disable graphics');
shell.echo(' --kernel=<kernel> Specify local kernel file to use');
shell.echo(' --local Download the kernel locally (i.e. in the module\'s directory)');
shell.echo(' --kernelver=<ver> Specify kernel version to download (defaults to latest)');
shell.echo('');
shell.echo(' --print-log Show log file written in curses mode (using less)');
Expand Down Expand Up @@ -95,7 +96,7 @@ var qemuVirtioRng = !!argv['virtio-rng'];
var dryRun = !!argv['dry-run'];
var verbose = !!argv.verbose;

getRuntime(kernelVer, kernelFile, function(err, runtimeFile) {
getRuntime(kernelVer, kernelFile, !!argv.local, function(err, runtimeFile) {
if (err) {
throw err;
}
Expand Down
5 changes: 3 additions & 2 deletions get-prebuilt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ var nugget = require('nugget');
var shell = require('shelljs');
var path = require('path');

module.exports = function(kernelVersion, cb) {
var kernelsDir = path.resolve(__dirname, 'runtimejs-kernels');
module.exports = function(kernelVersion, shouldBeLocal, cb) {
var basePath = shouldBeLocal ? __dirname : process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
var kernelsDir = path.resolve(basePath, '.runtime');
if (!shell.test('-d', kernelsDir)) {
shell.mkdir(kernelsDir);
}
Expand Down
4 changes: 2 additions & 2 deletions get-runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var getPrebuilt = require('./get-prebuilt');

module.exports = function(kernelVer, kernelFile, cb) {
module.exports = function(kernelVer, kernelFile, shouldBeLocal, cb) {
if (!kernelFile) {
return getPrebuilt(kernelVer, cb);
return getPrebuilt(kernelVer, shouldBeLocal, cb);
} else {
return cb(null, kernelFile);
}
Expand Down