Skip to content

Commit

Permalink
Merge tag '2.1.1' into develop
Browse files Browse the repository at this point in the history
Fixes some incompatibility between osx and linux #! line
  • Loading branch information
keiranmraine committed May 25, 2018
2 parents ee31321 + 6cf5c99 commit dfa4ea1
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 45 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changes

## 2.1.1

* Missing package in dependencies
* `--throw-deprecations` can't be in `#!` line for linux
* Added programatic handling

## 2.1.0

* Formalise to allow install via `npm`.
Expand Down
7 changes: 6 additions & 1 deletion js/jbrowse_rasterize.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env node --throw-deprecation
#!/usr/bin/env node

/**
* Copyright (c) 2016-2018 Genome Research Ltd.
Expand Down Expand Up @@ -31,6 +31,11 @@
* 2009, 2010, 2011, 2012’."
*/

process.on('unhandledRejection', (reason) => {
console.log('Unhandled Rejection at:', reason.stack || reason);
process.exit(1);
})

const VERSION = require('./version.js');

const puppeteer = require('puppeteer');
Expand Down
2 changes: 1 addition & 1 deletion js/version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = '2.1.0';
module.exports = '2.1.1';
89 changes: 47 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cancerit/cgpjbrowsetoolkit",
"version": "2.1.0",
"version": "2.1.1",
"description": "CLI tools for working with JBrowse",
"directories": {
"doc": "docs",
Expand All @@ -24,6 +24,7 @@
},
"homepage": "https://github.com/cancerit/cgpJBrowseToolkit#readme",
"dependencies": {
"commander": "^2.15.1",
"mkdirp": "^0.5.1",
"puppeteer": "^1.1.1"
},
Expand Down

0 comments on commit dfa4ea1

Please sign in to comment.