Fix Linux upgrade path #1641
3 changed files with 30 additions and 5 deletions
|
@ -55,9 +55,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
|
||||||
* Claim ID being null when reporting a claim that was not previously downloaded ([PR#1530](https://github.com/lbryio/lbry-app/pull/1530))
|
* Claim ID being null when reporting a claim that was not previously downloaded ([PR#1530](https://github.com/lbryio/lbry-app/pull/1530))
|
||||||
* URI and outpoint not being passed properly to API ([#1494](https://github.com/lbryio/lbry-app/issues/1494))
|
* URI and outpoint not being passed properly to API ([#1494](https://github.com/lbryio/lbry-app/issues/1494))
|
||||||
* Incorrect markdown preview on url with parentheses ([#1570](https://github.com/lbryio/lbry-app/issues/1570))
|
* Incorrect markdown preview on url with parentheses ([#1570](https://github.com/lbryio/lbry-app/issues/1570))
|
||||||
|
* Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.21.6] - 2018-06-05
|
## [0.21.6] - 2018-06-05
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
|
@ -1,17 +1,29 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { doStartUpgrade, doCancelUpgrade } from 'redux/actions/app';
|
import { doStartUpgrade, doCancelUpgrade } from 'redux/actions/app';
|
||||||
import { selectDownloadProgress, selectDownloadComplete } from 'redux/selectors/app';
|
import { doHideNotification } from 'lbry-redux';
|
||||||
|
import {
|
||||||
|
selectDownloadProgress,
|
||||||
|
selectDownloadComplete,
|
||||||
|
selectUpgradeDownloadPath,
|
||||||
|
} from 'redux/selectors/app';
|
||||||
import ModalDownloading from './view';
|
import ModalDownloading from './view';
|
||||||
|
|
||||||
const select = state => ({
|
const select = state => ({
|
||||||
downloadProgress: selectDownloadProgress(state),
|
downloadProgress: selectDownloadProgress(state),
|
||||||
downloadComplete: selectDownloadComplete(state),
|
downloadComplete: selectDownloadComplete(state),
|
||||||
|
downloadItem: selectUpgradeDownloadPath(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = dispatch => ({
|
||||||
startUpgrade: () => dispatch(doStartUpgrade()),
|
startUpgrade: () => dispatch(doStartUpgrade()),
|
||||||
cancelUpgrade: () => dispatch(doCancelUpgrade()),
|
cancelUpgrade: () => {
|
||||||
|
dispatch(doHideNotification());
|
||||||
|
dispatch(doCancelUpgrade());
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(ModalDownloading);
|
export default connect(
|
||||||
|
select,
|
||||||
|
perform
|
||||||
|
)(ModalDownloading);
|
||||||
|
|
|
@ -5,7 +5,13 @@ import Button from 'component/button';
|
||||||
|
|
||||||
class ModalDownloading extends React.PureComponent {
|
class ModalDownloading extends React.PureComponent {
|
||||||
render() {
|
render() {
|
||||||
const { downloadProgress, downloadComplete, startUpgrade, cancelUpgrade } = this.props;
|
const {
|
||||||
|
downloadProgress,
|
||||||
|
downloadComplete,
|
||||||
|
downloadItem,
|
||||||
|
startUpgrade,
|
||||||
|
cancelUpgrade,
|
||||||
|
} = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal isOpen contentLabel={__('Downloading Update')} type="custom">
|
<Modal isOpen contentLabel={__('Downloading Update')} type="custom">
|
||||||
|
@ -21,6 +27,12 @@ class ModalDownloading extends React.PureComponent {
|
||||||
'The app will close, and you will be prompted to install the latest version of LBRY.'
|
'The app will close, and you will be prompted to install the latest version of LBRY.'
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
{__(
|
||||||
|
'To launch installation manually, close LBRY and run the command below in the terminal.'
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
<blockquote>sudo dpkg -i {downloadItem}</blockquote>
|
||||||
<p>{__('After the install is complete, please reopen the app.')}</p>
|
<p>{__('After the install is complete, please reopen the app.')}</p>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
Loading…
Reference in a new issue